diff --git a/Connector_JST.pretty/JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical.kicad_mod
index 673b497d1..37ed7653b 100644
--- a/Connector_JST.pretty/JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical.kicad_mod
@@ -1,48 +1,67 @@
-(footprint "JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814B0)
+(footprint JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ACH series connector, BM01B-ACHSS-A-GAN-ETF (http://www.jst-mfg.com/product/pdf/eng/eACH.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ACH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 070c074f-c4f5-47c9-9361-b0a5dafa4f69)
   )
-  (fp_text value "JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical" (at 0 3.5) (layer "F.Fab")
+  (fp_text value JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical (at 0 3.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp af907947-dc0b-4490-8724-a03e88353d56)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -1.6 -2) (end 1.6 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.71 0.94) (end -1.71 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.71 -2.11) (end -0.56 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.56 -2.11) (end -0.56 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.71 0.94) (end 1.71 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.71 -2.11) (end 0.56 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.64 2.01) (end 0.64 2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.6 2.3) (end -0.8 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.8 2.3) (end -0.4 1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.4 1.9) (end 0.4 1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.4 1.9) (end 0.8 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.8 2.3) (end 1.6 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.6 -2) (end -1.6 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.6 -2) (end 1.6 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -2.8) (end -2.15 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.15 2.8) (end 2.15 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.15 2.8) (end 2.15 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.15 -2.8) (end -2.15 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -0.5 -2) (end 0 -1.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0 -1.292893) (end 0.5 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -3.153553) (end 0 -2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0 -2.8) (end 0.25 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.25 -3.153553) (end -0.25 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at 0 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.275 1.75) (size 0.75 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 1.275 1.75) (size 0.75 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
-    (tstamp 81fea903-e146-4f83-a9ee-faf481bbf436)
   )
-  (fp_line (start -1.71 -2.11) (end -0.56 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 22bfb1f2-f521-458a-9947-20fec0fcb5a4))
-  (fp_line (start -0.25 -3.153553) (end 0 -2.8) (layer "F.SilkS") (width 0.12) (tstamp 6c4a6544-1eed-40f1-a99b-cbcbf34d8375))
-  (fp_line (start 0.25 -3.153553) (end -0.25 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 712f2644-d208-47f2-8b58-931112358986))
-  (fp_line (start 1.71 0.94) (end 1.71 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 77cba8a3-427d-4c75-9b98-d64493a8df72))
-  (fp_line (start 0 -2.8) (end 0.25 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 7971bb40-4f0e-49e7-bc21-027d166c9e5c))
-  (fp_line (start -0.64 2.01) (end 0.64 2.01) (layer "F.SilkS") (width 0.12) (tstamp b3842b18-bd88-4c74-ad09-7b2a4e134809))
-  (fp_line (start -0.56 -2.11) (end -0.56 -2.3) (layer "F.SilkS") (width 0.12) (tstamp b99b1e13-030e-4226-b346-2b37e1cc5a2d))
-  (fp_line (start -1.71 0.94) (end -1.71 -2.11) (layer "F.SilkS") (width 0.12) (tstamp ece3247d-bc71-4cc3-9141-c96e97adb552))
-  (fp_line (start 1.71 -2.11) (end 0.56 -2.11) (layer "F.SilkS") (width 0.12) (tstamp fbd383ec-855f-4a56-a54e-3c3f917f2c33))
-  (fp_line (start -2.15 -2.8) (end -2.15 2.8) (layer "F.CrtYd") (width 0.05) (tstamp 0e9bfaa7-e59b-4cf5-8962-e5c9f9f4335f))
-  (fp_line (start 2.15 -2.8) (end -2.15 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 1c6f7983-0729-41e0-b789-d4aedff20109))
-  (fp_line (start 2.15 2.8) (end 2.15 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 8af5fca5-97c4-479c-8140-77e6aa52fb72))
-  (fp_line (start -2.15 2.8) (end 2.15 2.8) (layer "F.CrtYd") (width 0.05) (tstamp e048c950-7da5-4064-847e-cf785ed1621d))
-  (fp_line (start -0.4 1.9) (end 0.4 1.9) (layer "F.Fab") (width 0.1) (tstamp 13a61587-eb41-4932-9f30-6d8e55e96306))
-  (fp_line (start 1.6 -2) (end 1.6 2.3) (layer "F.Fab") (width 0.1) (tstamp 1d8abe3c-90dd-43ce-94dd-d6d6146fe55c))
-  (fp_line (start 0.8 2.3) (end 1.6 2.3) (layer "F.Fab") (width 0.1) (tstamp 311600f3-0d90-485e-817d-f8da03f5b3a3))
-  (fp_line (start -1.6 -2) (end -1.6 2.3) (layer "F.Fab") (width 0.1) (tstamp 4e119de1-3b6f-4fe8-9230-f09d0013ffee))
-  (fp_line (start -0.8 2.3) (end -0.4 1.9) (layer "F.Fab") (width 0.1) (tstamp 4f45d868-daf7-467e-a8f9-3d056acfcb18))
-  (fp_line (start -1.6 -2) (end 1.6 -2) (layer "F.Fab") (width 0.1) (tstamp 761521c2-fc8a-4204-b603-942797162349))
-  (fp_line (start -1.6 2.3) (end -0.8 2.3) (layer "F.Fab") (width 0.1) (tstamp a0159199-88c4-4b76-a7ef-a095cf6e0155))
-  (fp_line (start 0.4 1.9) (end 0.8 2.3) (layer "F.Fab") (width 0.1) (tstamp bfe4fc87-fd9b-493f-a2f4-2ed282d557d7))
-  (fp_line (start -0.5 -2) (end 0 -1.292893) (layer "F.Fab") (width 0.1) (tstamp cf847697-5f9e-4aa1-8963-3e3cbed5249d))
-  (fp_line (start 0 -1.292893) (end 0.5 -2) (layer "F.Fab") (width 0.1) (tstamp fbf73643-f1ef-4c3e-a1ff-ff368317f214))
-  (pad "1" smd roundrect (at 0 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bf89b706-799d-4f93-a5e3-4b06bc3bb548))
-  (pad "MP" smd roundrect (at -1.275 1.75) (size 0.75 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d78e0d6-7f1c-44c2-84a0-2859ee0bb88e))
-  (pad "MP" smd roundrect (at 1.275 1.75) (size 0.75 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 50e306f7-b93d-431b-ac86-d2de52e2832d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM01B-ACHSS-A-GAN-ETF_1x01-1MP_P1.20mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical.kicad_mod
index 010a0082d..2ec334f50 100644
--- a/Connector_JST.pretty/JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical.kicad_mod
@@ -1,53 +1,76 @@
-(footprint "JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814B0)
+(footprint JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ACH series connector, BM02B-ACHSS-GAN-ETF (http://www.jst-mfg.com/product/pdf/eng/eACH.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ACH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e48c5240-6af8-45db-a842-afcdec9bca9b)
   )
-  (fp_text value "JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical" (at 0 3.5) (layer "F.Fab")
+  (fp_text value JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical (at 0 3.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8d5e6189-8e2f-43c2-8cf7-127b9df09df5)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -2.1 -2) (end 2.1 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.21 1.24) (end -2.21 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.21 -2.11) (end -1.16 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.16 -2.11) (end -1.16 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.21 1.24) (end 2.21 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.21 -2.11) (end 1.16 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.14 2.41) (end -0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.79 2.41) (end -0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.39 1.91) (end 0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.39 1.91) (end 0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.79 2.41) (end 1.14 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.1 2.3) (end -0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.9 2.3) (end -0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 1.8) (end 0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 1.8) (end 0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.9 2.3) (end 2.1 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.1 -2) (end -2.1 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.1 -2) (end 2.1 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.6 -2.8) (end -2.6 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.6 2.8) (end 2.6 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.6 2.8) (end 2.6 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.6 -2.8) (end -2.6 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.1 -2) (end -0.6 -1.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.6 -1.292893) (end -0.1 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -3.153553) (end -0.6 -2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.6 -2.8) (end -0.35 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.35 -3.153553) (end -0.85 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -0.6 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.6 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.75 1.9) (size 0.7 0.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 1.75 1.9) (size 0.7 0.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 09f0157c-9b44-4158-8d8e-3a683c18e291)
   )
-  (fp_line (start -0.39 1.91) (end 0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp 0fa0147b-3c8c-496f-835f-7344ff1fd4cf))
-  (fp_line (start 0.79 2.41) (end 1.14 2.41) (layer "F.SilkS") (width 0.12) (tstamp 48827e8e-f292-4985-99c6-34fb88a75831))
-  (fp_line (start -1.16 -2.11) (end -1.16 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 4b122ea8-871d-408c-bdca-3c7108cbfa0b))
-  (fp_line (start -0.6 -2.8) (end -0.35 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 57187c7f-e736-4a02-9550-2457114b1d1b))
-  (fp_line (start -0.35 -3.153553) (end -0.85 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 58f3bc1d-961e-482e-a25e-6e5a2003c967))
-  (fp_line (start 0.39 1.91) (end 0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp a713125f-76c2-4ced-b0c1-c32d74834e86))
-  (fp_line (start 2.21 -2.11) (end 1.16 -2.11) (layer "F.SilkS") (width 0.12) (tstamp af9bcad4-e230-40e7-ab08-8de68d19af5c))
-  (fp_line (start 2.21 1.24) (end 2.21 -2.11) (layer "F.SilkS") (width 0.12) (tstamp b2bcc7d5-5dd6-4a28-b90c-04335082bcac))
-  (fp_line (start -2.21 -2.11) (end -1.16 -2.11) (layer "F.SilkS") (width 0.12) (tstamp bd6de93d-4702-48c8-9e54-5679fbb54548))
-  (fp_line (start -2.21 1.24) (end -2.21 -2.11) (layer "F.SilkS") (width 0.12) (tstamp c2933373-460c-4455-8cd1-d08982b0ae40))
-  (fp_line (start -0.79 2.41) (end -0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp c4fc919f-a52a-43b7-81cf-2b32c4f322d3))
-  (fp_line (start -0.85 -3.153553) (end -0.6 -2.8) (layer "F.SilkS") (width 0.12) (tstamp ccf3a2bf-86b7-4075-a7b5-6d8b859bdb39))
-  (fp_line (start -1.14 2.41) (end -0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp ebcbf17b-4f9d-44de-8d73-e6553a7a5d7b))
-  (fp_line (start 2.6 2.8) (end 2.6 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 5ca8e0bb-95b8-4fa4-b1a2-019e5bef34fd))
-  (fp_line (start -2.6 -2.8) (end -2.6 2.8) (layer "F.CrtYd") (width 0.05) (tstamp 8ac63350-51b7-4d26-a788-ded8300b9d03))
-  (fp_line (start -2.6 2.8) (end 2.6 2.8) (layer "F.CrtYd") (width 0.05) (tstamp df9419a3-6164-4a0f-ba05-e944ec1e02c6))
-  (fp_line (start 2.6 -2.8) (end -2.6 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp e6b78646-fadd-46c8-b29f-9576334160f2))
-  (fp_line (start -0.5 1.8) (end 0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp 26f00d98-d093-42c1-9a1a-f00d1ab03c4a))
-  (fp_line (start 0.9 2.3) (end 2.1 2.3) (layer "F.Fab") (width 0.1) (tstamp 39c62cbe-d0ee-4303-89fc-8c9bb974abd1))
-  (fp_line (start -2.1 2.3) (end -0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp 43e9c52b-463d-4024-bf43-2c5accbe801d))
-  (fp_line (start -2.1 -2) (end 2.1 -2) (layer "F.Fab") (width 0.1) (tstamp 73e421bc-72c6-4573-91c5-33d45f0a0e8b))
-  (fp_line (start -2.1 -2) (end -2.1 2.3) (layer "F.Fab") (width 0.1) (tstamp 782b46df-3e30-44bb-bca2-469084964f6c))
-  (fp_line (start 2.1 -2) (end 2.1 2.3) (layer "F.Fab") (width 0.1) (tstamp 81b62d30-431f-4075-87dd-43ef09e18644))
-  (fp_line (start -0.9 2.3) (end -0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp 964617ae-3934-467d-91c3-bdcbfbb97686))
-  (fp_line (start -0.6 -1.292893) (end -0.1 -2) (layer "F.Fab") (width 0.1) (tstamp d2fadf1b-2349-452a-b426-bc2fbca54c53))
-  (fp_line (start 0.5 1.8) (end 0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp e19696cb-9d47-4048-a602-c19b3fcb4d8b))
-  (fp_line (start -1.1 -2) (end -0.6 -1.292893) (layer "F.Fab") (width 0.1) (tstamp fa40c796-02b4-4db7-894f-bcdf90795898))
-  (pad "1" smd roundrect (at -0.6 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1d8b1c30-78a2-4ec2-b30f-017d5609b96d))
-  (pad "2" smd roundrect (at 0.6 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e0af1a9-2338-4739-b2c8-d1b1dfa038b0))
-  (pad "MP" smd roundrect (at 1.75 1.9) (size 0.7 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b4091732-7ca4-402b-a37e-86bac70a2b95))
-  (pad "MP" smd roundrect (at -1.75 1.9) (size 0.7 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d02f9566-c731-4de6-8a66-03b001279f6a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM02B-ACHSS-GAN-ETF_1x02-1MP_P1.20mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical.kicad_mod
index cd194bf1a..9433613c7 100644
--- a/Connector_JST.pretty/JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical.kicad_mod
@@ -1,54 +1,77 @@
-(footprint "JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814B0)
+(footprint JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ACH series connector, BM03B-ACHSS-GAN-ETF (http://www.jst-mfg.com/product/pdf/eng/eACH.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ACH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 44bd8e76-dacb-42ca-9023-3ef936a65c6b)
   )
-  (fp_text value "JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical" (at 0 3.5) (layer "F.Fab")
+  (fp_text value JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical (at 0 3.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 95c48a6e-797d-4968-a9ce-14e692903eae)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -2.7 -2) (end 2.7 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.81 1.24) (end -2.81 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.81 -2.11) (end -1.76 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.76 -2.11) (end -1.76 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.81 1.24) (end 2.81 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.81 -2.11) (end 1.76 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.74 2.41) (end -0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.79 2.41) (end -0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.39 1.91) (end 0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.39 1.91) (end 0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.79 2.41) (end 1.74 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.7 2.3) (end -0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.9 2.3) (end -0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 1.8) (end 0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 1.8) (end 0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.9 2.3) (end 2.7 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.7 -2) (end -2.7 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.7 -2) (end 2.7 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.2 -2.8) (end -3.2 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.2 2.8) (end 3.2 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.2 2.8) (end 3.2 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.2 -2.8) (end -3.2 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.7 -2) (end -1.2 -1.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.2 -1.292893) (end -0.7 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.45 -3.153553) (end -1.2 -2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.2 -2.8) (end -0.95 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.95 -3.153553) (end -1.45 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -1.2 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1.2 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.35 1.9) (size 0.7 0.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 2.35 1.9) (size 0.7 0.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8d1f3c4d-4e67-474a-b657-bf688a9362c2)
   )
-  (fp_line (start -1.76 -2.11) (end -1.76 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 0542a6bc-e513-43e3-9bc1-0840a98d9d6b))
-  (fp_line (start -0.95 -3.153553) (end -1.45 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 1b3733e5-4ea4-4199-ad6d-c69fbf6bfd53))
-  (fp_line (start 2.81 1.24) (end 2.81 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 1fd6735b-d957-419e-ac97-a1c243165cb5))
-  (fp_line (start -2.81 1.24) (end -2.81 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 41d8ad62-be7e-43f7-b35a-0c6e24ae1c0e))
-  (fp_line (start 0.79 2.41) (end 1.74 2.41) (layer "F.SilkS") (width 0.12) (tstamp 881ff274-5290-49b6-bdf6-d6e62c67cf2a))
-  (fp_line (start -1.45 -3.153553) (end -1.2 -2.8) (layer "F.SilkS") (width 0.12) (tstamp 9670d427-436c-452d-87f6-640b6ab71415))
-  (fp_line (start -1.74 2.41) (end -0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp acd1224d-7e61-49cd-97ce-c233939b001e))
-  (fp_line (start 0.39 1.91) (end 0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp ad915b43-7cda-46e4-8ca9-00fe9851f638))
-  (fp_line (start -0.79 2.41) (end -0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp b0ba69d4-23c4-4dbc-94b6-d3cc47864f36))
-  (fp_line (start -1.2 -2.8) (end -0.95 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp c6939e68-0eca-4744-bc3e-51b0da79011d))
-  (fp_line (start 2.81 -2.11) (end 1.76 -2.11) (layer "F.SilkS") (width 0.12) (tstamp d23a9a35-7bff-48c1-9c45-2f0ea5a81f53))
-  (fp_line (start -0.39 1.91) (end 0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp e794fc60-735f-4918-8ce7-e7076648bf9a))
-  (fp_line (start -2.81 -2.11) (end -1.76 -2.11) (layer "F.SilkS") (width 0.12) (tstamp f2a721da-56a9-4fb4-aefc-e173dea0b410))
-  (fp_line (start -3.2 -2.8) (end -3.2 2.8) (layer "F.CrtYd") (width 0.05) (tstamp 4c5b399c-8387-4d38-8dbb-367dea3840c4))
-  (fp_line (start 3.2 -2.8) (end -3.2 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 9c846f0f-55eb-405c-9290-b78ad03c0784))
-  (fp_line (start 3.2 2.8) (end 3.2 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp b77b978c-3c63-4557-8d50-c510a772b23a))
-  (fp_line (start -3.2 2.8) (end 3.2 2.8) (layer "F.CrtYd") (width 0.05) (tstamp d2d1d274-5336-4037-9ad0-04c983f2a29c))
-  (fp_line (start -0.9 2.3) (end -0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp 05f9fda9-09db-48b1-9fd5-ac2cda6f6940))
-  (fp_line (start -2.7 -2) (end 2.7 -2) (layer "F.Fab") (width 0.1) (tstamp 44f7a36e-8b22-4ea2-9e9d-346ab3d46e5b))
-  (fp_line (start -2.7 2.3) (end -0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp 4bebb87a-ec4f-40ed-a342-e0fe4d3c1a02))
-  (fp_line (start 0.9 2.3) (end 2.7 2.3) (layer "F.Fab") (width 0.1) (tstamp 57519824-3029-494a-9ed1-04549eaa05b8))
-  (fp_line (start -1.7 -2) (end -1.2 -1.292893) (layer "F.Fab") (width 0.1) (tstamp 92b28d1f-cb2a-4265-a5d0-6438376baca6))
-  (fp_line (start 2.7 -2) (end 2.7 2.3) (layer "F.Fab") (width 0.1) (tstamp 96540b69-a90b-4b88-b2b7-312f23770d17))
-  (fp_line (start -1.2 -1.292893) (end -0.7 -2) (layer "F.Fab") (width 0.1) (tstamp a0d0e941-81bb-4445-9a8b-e8b12efa2b9c))
-  (fp_line (start -2.7 -2) (end -2.7 2.3) (layer "F.Fab") (width 0.1) (tstamp ae8f5bcc-15bb-491d-908a-3542f4a250f6))
-  (fp_line (start -0.5 1.8) (end 0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp ba162da5-500a-434f-b457-500421d7b300))
-  (fp_line (start 0.5 1.8) (end 0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp cb17c2b2-c4b7-4f40-9d8f-4bcdcf9a3130))
-  (pad "1" smd roundrect (at -1.2 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5b9418cd-ba66-4cb3-a058-2810504d5642))
-  (pad "2" smd roundrect (at 0 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 947d3142-d643-4f05-8cc4-9d9de4716ccb))
-  (pad "3" smd roundrect (at 1.2 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c1182e56-0d1d-4098-8554-bc8ff8b8d19a))
-  (pad "MP" smd roundrect (at -2.35 1.9) (size 0.7 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 269f5dfc-02f7-45fb-94b1-96ba658f752d))
-  (pad "MP" smd roundrect (at 2.35 1.9) (size 0.7 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 84844326-2968-46f7-90f5-03032a18d86d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM03B-ACHSS-GAN-ETF_1x03-1MP_P1.20mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical.kicad_mod
index 8b403f08c..21a44f531 100644
--- a/Connector_JST.pretty/JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical.kicad_mod
@@ -1,55 +1,78 @@
-(footprint "JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814B0)
+(footprint JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ACH series connector, BM04B-ACHSS-A-GAN-ETF (http://www.jst-mfg.com/product/pdf/eng/eACH.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ACH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1eb91d68-9516-4db0-8456-bc567cdccdcc)
   )
-  (fp_text value "JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical" (at 0 3.5) (layer "F.Fab")
+  (fp_text value JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical (at 0 3.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp fff69b50-3f4b-4403-8c38-b147ceed46e1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.3 -2) (end 3.3 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.41 0.94) (end -3.41 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.41 -2.11) (end -2.36 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.36 -2.11) (end -2.36 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.41 0.94) (end 3.41 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.41 -2.11) (end 2.36 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.34 2.41) (end -0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.79 2.41) (end -0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.39 1.91) (end 0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.39 1.91) (end 0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.79 2.41) (end 2.34 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.3 2.3) (end -0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.9 2.3) (end -0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 1.8) (end 0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 1.8) (end 0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.9 2.3) (end 3.3 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.3 -2) (end -3.3 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.3 -2) (end 3.3 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -2.8) (end -3.85 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.85 2.8) (end 3.85 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.85 2.8) (end 3.85 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.85 -2.8) (end -3.85 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.3 -2) (end -1.8 -1.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.8 -1.292893) (end -1.3 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.05 -3.153553) (end -1.8 -2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.8 -2.8) (end -1.55 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.55 -3.153553) (end -2.05 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -1.8 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.6 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.6 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.8 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.975 1.75) (size 0.75 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 2.975 1.75) (size 0.75 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp bafbc09d-018d-416f-952d-f7baea3d5805)
   )
-  (fp_line (start -0.39 1.91) (end 0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp 17a812af-ac21-4cca-acb9-0f830f85ae4c))
-  (fp_line (start -0.79 2.41) (end -0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp 446b7558-347f-4361-bc44-194c38a99f5b))
-  (fp_line (start 3.41 -2.11) (end 2.36 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 4f079a77-d07a-4af5-bde3-e9cc09184e09))
-  (fp_line (start -3.41 -2.11) (end -2.36 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 4f3619eb-1e35-4bce-a1f0-969b713da826))
-  (fp_line (start -1.8 -2.8) (end -1.55 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 5df617e8-5ddc-48cf-8f43-ca5095537470))
-  (fp_line (start 0.79 2.41) (end 2.34 2.41) (layer "F.SilkS") (width 0.12) (tstamp 5e23be0a-fe9b-41e4-976a-d9dde7e3e9e1))
-  (fp_line (start -1.55 -3.153553) (end -2.05 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 7196041f-2bfb-4b54-a623-607aa49cb896))
-  (fp_line (start -3.41 0.94) (end -3.41 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 7a4bba79-06c8-4185-a07f-9f8ec9fa28b2))
-  (fp_line (start 0.39 1.91) (end 0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp a310ceab-dde3-40fe-bad1-17ad61eb978f))
-  (fp_line (start 3.41 0.94) (end 3.41 -2.11) (layer "F.SilkS") (width 0.12) (tstamp a57b3995-9e34-4867-a407-547a82e93352))
-  (fp_line (start -2.05 -3.153553) (end -1.8 -2.8) (layer "F.SilkS") (width 0.12) (tstamp a57c1c33-ecf9-4413-a5b8-8daabe60c58b))
-  (fp_line (start -2.36 -2.11) (end -2.36 -2.3) (layer "F.SilkS") (width 0.12) (tstamp aba8d11e-008d-44fd-8e5a-9c25e75183c7))
-  (fp_line (start -2.34 2.41) (end -0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp b17d1e09-a686-4092-8984-1060a76f13d8))
-  (fp_line (start 3.85 2.8) (end 3.85 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 077c32f3-aa32-49c5-b4a1-322294ccc103))
-  (fp_line (start -3.85 -2.8) (end -3.85 2.8) (layer "F.CrtYd") (width 0.05) (tstamp 1739dc3e-6085-493e-8c18-b2e1c368aee6))
-  (fp_line (start 3.85 -2.8) (end -3.85 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 7319b893-4302-4f16-b726-ac87e0a1d5a7))
-  (fp_line (start -3.85 2.8) (end 3.85 2.8) (layer "F.CrtYd") (width 0.05) (tstamp 7ffb7bb7-6b79-4829-a2ba-a9a30ac1e961))
-  (fp_line (start 0.9 2.3) (end 3.3 2.3) (layer "F.Fab") (width 0.1) (tstamp 00d30c3f-5525-4460-8ba5-fa09e1597836))
-  (fp_line (start -0.9 2.3) (end -0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp 0e69cd18-334e-4772-871f-bbe6ec756141))
-  (fp_line (start -3.3 2.3) (end -0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp 569e0665-d5db-4f2c-82cd-1f88f09c0d49))
-  (fp_line (start -3.3 -2) (end 3.3 -2) (layer "F.Fab") (width 0.1) (tstamp 85024fc5-61ec-4843-b9a2-b83dd22c76ce))
-  (fp_line (start -0.5 1.8) (end 0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp 98ea31c4-c5ca-43b8-aebe-5781ecf12959))
-  (fp_line (start -3.3 -2) (end -3.3 2.3) (layer "F.Fab") (width 0.1) (tstamp 9ac94d89-1d88-4630-ab12-4d3f6e2cd6a4))
-  (fp_line (start 3.3 -2) (end 3.3 2.3) (layer "F.Fab") (width 0.1) (tstamp b9f45ec1-bdac-4279-a2a5-43df1f7b10ba))
-  (fp_line (start 0.5 1.8) (end 0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp c18069ce-5701-4402-a3ad-2c82d70035cd))
-  (fp_line (start -1.8 -1.292893) (end -1.3 -2) (layer "F.Fab") (width 0.1) (tstamp efd6ef14-ed2c-4647-abb1-e7a5577d9884))
-  (fp_line (start -2.3 -2) (end -1.8 -1.292893) (layer "F.Fab") (width 0.1) (tstamp f235e48e-2882-4f18-9423-7c31f89b3759))
-  (pad "1" smd roundrect (at -1.8 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 978a6521-a18b-435e-83cd-020c4e9c1f46))
-  (pad "2" smd roundrect (at -0.6 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c91acf8-4466-4bc3-82f7-c055364fef4c))
-  (pad "3" smd roundrect (at 0.6 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 602f9a5f-b7c0-4b52-9ad3-73422c19844a))
-  (pad "4" smd roundrect (at 1.8 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bf69568e-51a7-4791-8dbc-63ac89e2ab74))
-  (pad "MP" smd roundrect (at 2.975 1.75) (size 0.75 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0d9883fe-2987-4175-9e5d-292788c5519c))
-  (pad "MP" smd roundrect (at -2.975 1.75) (size 0.75 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp be699a69-ad61-47c2-a46b-89d2852e26da))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM04B-ACHSS-A-GAN-ETF_1x04-1MP_P1.20mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical.kicad_mod
index ef99aa54f..3df8c45e3 100644
--- a/Connector_JST.pretty/JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical.kicad_mod
@@ -1,56 +1,79 @@
-(footprint "JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814B0)
+(footprint JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ACH series connector, BM05B-ACHSS-A-GAN-ETF (http://www.jst-mfg.com/product/pdf/eng/eACH.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ACH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c27903b8-71d8-46a6-bafb-abec2a4117ab)
   )
-  (fp_text value "JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical" (at 0 3.5) (layer "F.Fab")
+  (fp_text value JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical (at 0 3.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 26d77f76-17ff-4ce1-abfd-3a459dfdd4e1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.9 -2) (end 3.9 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.01 0.94) (end -4.01 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.01 -2.11) (end -2.96 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.96 -2.11) (end -2.96 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.01 0.94) (end 4.01 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.01 -2.11) (end 2.96 -2.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.94 2.41) (end -0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.79 2.41) (end -0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.39 1.91) (end 0.39 1.91)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.39 1.91) (end 0.79 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 0.79 2.41) (end 2.94 2.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.9 2.3) (end -0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.9 2.3) (end -0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 1.8) (end 0.5 1.8)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 1.8) (end 0.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.9 2.3) (end 3.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.9 -2) (end -3.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.9 -2) (end 3.9 2.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.45 -2.8) (end -4.45 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.45 2.8) (end 4.45 2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.45 2.8) (end 4.45 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.45 -2.8) (end -4.45 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.9 -2) (end -2.4 -1.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.4 -1.292893) (end -1.9 -2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -3.153553) (end -2.4 -2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.4 -2.8) (end -2.15 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.15 -3.153553) (end -2.65 -3.153553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -2.4 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.2 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.2 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2.4 -1.875) (size 0.6 0.85) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.575 1.75) (size 0.75 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.575 1.75) (size 0.75 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4d722b76-9eb4-4247-9f05-61c1cbf821da)
   )
-  (fp_line (start -2.15 -3.153553) (end -2.65 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 04f8926a-9591-4456-b5c6-d0972a157022))
-  (fp_line (start -2.4 -2.8) (end -2.15 -3.153553) (layer "F.SilkS") (width 0.12) (tstamp 062351a8-c31d-4bfe-8c39-1b4e12ee6023))
-  (fp_line (start 4.01 -2.11) (end 2.96 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 18f398b5-34d1-4429-8c77-bb418ca05ad8))
-  (fp_line (start -2.96 -2.11) (end -2.96 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 3e872aea-3917-4614-9024-56409c6b2620))
-  (fp_line (start -4.01 0.94) (end -4.01 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 68d98cca-a78d-4f8d-ae7e-c8550f270b6f))
-  (fp_line (start 4.01 0.94) (end 4.01 -2.11) (layer "F.SilkS") (width 0.12) (tstamp 6b8c480f-84b1-4f20-aa9e-e13235feffe3))
-  (fp_line (start 0.79 2.41) (end 2.94 2.41) (layer "F.SilkS") (width 0.12) (tstamp 80c83032-168b-4a0a-8912-536629478b55))
-  (fp_line (start -0.39 1.91) (end 0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp a2aa16c2-43ad-4871-936c-42cfe08541ae))
-  (fp_line (start -2.94 2.41) (end -0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp a32e3fab-376b-4194-908d-edaef51e3f31))
-  (fp_line (start -0.79 2.41) (end -0.39 1.91) (layer "F.SilkS") (width 0.12) (tstamp a5857c81-e428-405a-acd5-769fd31f689d))
-  (fp_line (start 0.39 1.91) (end 0.79 2.41) (layer "F.SilkS") (width 0.12) (tstamp c0cf80bd-345a-4209-a71b-3fba3843e8b1))
-  (fp_line (start -2.65 -3.153553) (end -2.4 -2.8) (layer "F.SilkS") (width 0.12) (tstamp db0d663e-684c-4d79-9953-55ebe538b5fd))
-  (fp_line (start -4.01 -2.11) (end -2.96 -2.11) (layer "F.SilkS") (width 0.12) (tstamp fcc81168-c590-4657-b6a0-d2c2a873995a))
-  (fp_line (start 4.45 -2.8) (end -4.45 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 4d18f880-49e1-4f63-b105-d3ab3661f6fa))
-  (fp_line (start 4.45 2.8) (end 4.45 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 9daa6707-078c-477e-9b20-1e4e429e1ea1))
-  (fp_line (start -4.45 2.8) (end 4.45 2.8) (layer "F.CrtYd") (width 0.05) (tstamp c59e1624-3aa1-42b5-94bb-69715c5b9308))
-  (fp_line (start -4.45 -2.8) (end -4.45 2.8) (layer "F.CrtYd") (width 0.05) (tstamp ecb7355b-d894-47ed-9b2a-4669901ac1e1))
-  (fp_line (start 0.5 1.8) (end 0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp 0bcd68c5-de79-48b4-a2df-ad2c6cc0c857))
-  (fp_line (start 3.9 -2) (end 3.9 2.3) (layer "F.Fab") (width 0.1) (tstamp 7463b422-94ab-44c4-b67f-41d607389510))
-  (fp_line (start -3.9 -2) (end -3.9 2.3) (layer "F.Fab") (width 0.1) (tstamp 76096a41-ad3d-4692-b31f-afbf4f794146))
-  (fp_line (start -2.4 -1.292893) (end -1.9 -2) (layer "F.Fab") (width 0.1) (tstamp 82205cb4-9a48-442a-803d-ed535d09b402))
-  (fp_line (start 0.9 2.3) (end 3.9 2.3) (layer "F.Fab") (width 0.1) (tstamp a983d730-e3ae-4a4f-93f0-0bea82cbd001))
-  (fp_line (start -0.5 1.8) (end 0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp aed20f96-297b-4a63-82e7-7ae989c2059b))
-  (fp_line (start -3.9 2.3) (end -0.9 2.3) (layer "F.Fab") (width 0.1) (tstamp c0235515-6933-436b-a410-5f0558675af0))
-  (fp_line (start -3.9 -2) (end 3.9 -2) (layer "F.Fab") (width 0.1) (tstamp dea33e6e-83da-415c-a840-a7d18d406e2d))
-  (fp_line (start -0.9 2.3) (end -0.5 1.8) (layer "F.Fab") (width 0.1) (tstamp e487d26d-3b90-4d73-af95-b8ddfcb955e5))
-  (fp_line (start -2.9 -2) (end -2.4 -1.292893) (layer "F.Fab") (width 0.1) (tstamp f77db72c-0280-44a9-b8e3-a3500a290a11))
-  (pad "1" smd roundrect (at -2.4 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8287d219-e696-404d-a5a3-e4c9a1c6938a))
-  (pad "2" smd roundrect (at -1.2 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5921170a-7960-4412-a59f-bf1d8e67a5f0))
-  (pad "3" smd roundrect (at 0 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c54f92ce-ee4b-474d-97f4-1f877bce9317))
-  (pad "4" smd roundrect (at 1.2 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8de88a7d-74db-4697-9f7d-e2694c1cd03a))
-  (pad "5" smd roundrect (at 2.4 -1.875) (size 0.6 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f82b0dc3-de8b-457d-a238-f1cb950c4495))
-  (pad "MP" smd roundrect (at 3.575 1.75) (size 0.75 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bb52cf6d-06a9-44a6-b11b-15a41f28eda4))
-  (pad "MP" smd roundrect (at -3.575 1.75) (size 0.75 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f800ddf4-6191-42f5-a868-9c1750fb968d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ACH_BM05B-ACHSS-A-GAN-ETF_1x05-1MP_P1.20mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical.kicad_mod
index 936c3a901..d1193c654 100644
--- a/Connector_JST.pretty/JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,51 +1,71 @@
-(footprint "JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST AUH series connector, BM03B-AUHKS-GA-TB (http://www.jst-mfg.com/product/pdf/eng/eAUH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST AUH side entry")
+  (tags "connector JST AUH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.72) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.72) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4908d427-a121-45f1-9c0b-519c42185eab)
   )
-  (fp_text value "JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical" (at 0 3.72) (layer "F.Fab")
+  (fp_text value JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical (at 0 3.72) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cf973b8b-30ce-4adc-a954-eeedec239e4c)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.275 -2.075) (end 3.275 -2.075)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.385 0.815) (end -3.385 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.385 -2.185) (end -2.06 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.06 -2.185) (end -2.06 -2.525)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.385 0.815) (end 3.385 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.385 -2.185) (end 2.06 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.39 2.335) (end -2.165 2.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.165 2.335) (end -2.165 1.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.165 1.335) (end 2.165 1.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.165 1.335) (end 2.165 2.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.165 2.335) (end 2.39 2.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.275 2.225) (end -2.275 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.275 2.225) (end -2.275 1.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.275 1.225) (end 2.275 1.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.275 1.225) (end 2.275 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.275 2.225) (end 3.275 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.275 -2.075) (end -3.275 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.275 -2.075) (end 3.275 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.78 -3.02) (end -3.78 3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.78 3.02) (end 3.78 3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.78 3.02) (end 3.78 -3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.78 -3.02) (end -3.78 -3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2 -2.075) (end -1.5 -1.367893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -1.367893) (end -1 -2.075)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.5 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1.5 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.95 1.8) (size 0.6 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 2.95 1.8) (size 0.6 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp bfbafbb6-f814-40ad-9564-a5be3105434d)
   )
-  (fp_line (start -3.385 0.815) (end -3.385 -2.185) (layer "F.SilkS") (width 0.12) (tstamp 0dae1e6a-a8df-4c46-9ba2-ca9c3b9781b6))
-  (fp_line (start 3.385 -2.185) (end 2.06 -2.185) (layer "F.SilkS") (width 0.12) (tstamp 12d16d77-9ac0-44ad-b616-0bc097ca0254))
-  (fp_line (start -3.385 -2.185) (end -2.06 -2.185) (layer "F.SilkS") (width 0.12) (tstamp 1f729f50-8e46-4e6f-aa74-317a08da549d))
-  (fp_line (start -2.165 1.335) (end 2.165 1.335) (layer "F.SilkS") (width 0.12) (tstamp 348dd747-885c-44c9-a04c-b0eccb2da324))
-  (fp_line (start -2.39 2.335) (end -2.165 2.335) (layer "F.SilkS") (width 0.12) (tstamp 8419f65a-1c28-4ad2-8402-47e55001dfb6))
-  (fp_line (start -2.165 2.335) (end -2.165 1.335) (layer "F.SilkS") (width 0.12) (tstamp 955d4610-8df5-4cc9-8940-99b1f67d3118))
-  (fp_line (start 2.165 2.335) (end 2.39 2.335) (layer "F.SilkS") (width 0.12) (tstamp a34929b6-9aa3-4f2c-b66e-294f2b1eef6f))
-  (fp_line (start 3.385 0.815) (end 3.385 -2.185) (layer "F.SilkS") (width 0.12) (tstamp d436e587-b536-4d6a-a37a-cf48424c9118))
-  (fp_line (start 2.165 1.335) (end 2.165 2.335) (layer "F.SilkS") (width 0.12) (tstamp d9746eb1-8666-4c3d-9ee7-bb9c6136e1a5))
-  (fp_line (start -2.06 -2.185) (end -2.06 -2.525) (layer "F.SilkS") (width 0.12) (tstamp f26f559c-e154-4e50-8bf9-2c1b8c8a22fe))
-  (fp_line (start -3.78 -3.02) (end -3.78 3.02) (layer "F.CrtYd") (width 0.05) (tstamp 5d04e995-912c-4177-bad3-abce760072b9))
-  (fp_line (start 3.78 -3.02) (end -3.78 -3.02) (layer "F.CrtYd") (width 0.05) (tstamp a7ebb0b2-0b84-4d60-b929-439f16b59db1))
-  (fp_line (start 3.78 3.02) (end 3.78 -3.02) (layer "F.CrtYd") (width 0.05) (tstamp e96dde69-9f61-4ed7-8f71-bf193e696d8f))
-  (fp_line (start -3.78 3.02) (end 3.78 3.02) (layer "F.CrtYd") (width 0.05) (tstamp fa32c0e7-0010-498c-86ee-f0174d9390bb))
-  (fp_line (start -2 -2.075) (end -1.5 -1.367893) (layer "F.Fab") (width 0.1) (tstamp 24935757-0b65-4241-843e-cfcaead7232d))
-  (fp_line (start 2.275 1.225) (end 2.275 2.225) (layer "F.Fab") (width 0.1) (tstamp 34867bd6-49f4-4567-a4ab-b7926cd87213))
-  (fp_line (start -3.275 -2.075) (end -3.275 2.225) (layer "F.Fab") (width 0.1) (tstamp 5745021b-b3bb-457d-ac30-3d053c88d79a))
-  (fp_line (start -3.275 2.225) (end -2.275 2.225) (layer "F.Fab") (width 0.1) (tstamp 7f89a98a-33d1-4b41-a839-cf53dfc629cc))
-  (fp_line (start 2.275 2.225) (end 3.275 2.225) (layer "F.Fab") (width 0.1) (tstamp 995dfbfc-5f23-4b64-afb5-62818f4e9b81))
-  (fp_line (start -2.275 1.225) (end 2.275 1.225) (layer "F.Fab") (width 0.1) (tstamp b81c4890-fbd5-4e88-960c-da6cd739004c))
-  (fp_line (start -3.275 -2.075) (end 3.275 -2.075) (layer "F.Fab") (width 0.1) (tstamp bb64a52f-5340-4d0c-8274-7e42f3f33a5f))
-  (fp_line (start -2.275 2.225) (end -2.275 1.225) (layer "F.Fab") (width 0.1) (tstamp db39f30e-c878-4ce5-9e9b-91ee686ab7c7))
-  (fp_line (start 3.275 -2.075) (end 3.275 2.225) (layer "F.Fab") (width 0.1) (tstamp e01d6424-d9f9-458e-89bb-1cec73a8bdc7))
-  (fp_line (start -1.5 -1.367893) (end -1 -2.075) (layer "F.Fab") (width 0.1) (tstamp fcab2218-370a-4640-b799-889442356f52))
-  (pad "1" smd roundrect (at -1.5 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6c1a5b87-e69c-4f7d-aca4-fad9bb6a887d))
-  (pad "2" smd roundrect (at 0 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 863ba66c-0c4f-4ebc-9f25-e1cf8eb918bb))
-  (pad "3" smd roundrect (at 1.5 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 06d951f6-04f3-4be2-accd-a4ae65d754f1))
-  (pad "MP" smd roundrect (at -2.95 1.8) (size 0.6 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp af597823-03eb-4f71-8019-8f1ce8c1e280))
-  (pad "MP" smd roundrect (at 2.95 1.8) (size 0.6 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f9645b03-c203-4c96-9289-aa876bdc90e8))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_AUH_BM03B-AUHKS-GA-TB_1x03-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical.kicad_mod
index 8d36d05ce..182f03b9c 100644
--- a/Connector_JST.pretty/JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,53 +1,73 @@
-(footprint "JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST AUH series connector, BM05B-AUHKS-GA-TB (http://www.jst-mfg.com/product/pdf/eng/eAUH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST AUH side entry")
+  (tags "connector JST AUH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.72) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.72) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4ce837ae-7954-41c1-95b5-bffd6d26f50f)
   )
-  (fp_text value "JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical" (at 0 3.72) (layer "F.Fab")
+  (fp_text value JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical (at 0 3.72) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2e7d0932-8e00-44f5-9721-cfb7c3c4f379)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4.775 -2.075) (end 4.775 -2.075)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.885 0.815) (end -4.885 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.885 -2.185) (end -3.56 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.56 -2.185) (end -3.56 -2.525)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.885 0.815) (end 4.885 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.885 -2.185) (end 3.56 -2.185)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.89 2.335) (end -3.665 2.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.665 2.335) (end -3.665 1.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.665 1.335) (end 3.665 1.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.665 1.335) (end 3.665 2.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.665 2.335) (end 3.89 2.335)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.775 2.225) (end -3.775 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.775 2.225) (end -3.775 1.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.775 1.225) (end 3.775 1.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.775 1.225) (end 3.775 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.775 2.225) (end 4.775 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.775 -2.075) (end -4.775 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.775 -2.075) (end 4.775 2.225)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.28 -3.02) (end -5.28 3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.28 3.02) (end 5.28 3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.28 3.02) (end 5.28 -3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.28 -3.02) (end -5.28 -3.02)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 -2.075) (end -3 -1.367893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 -1.367893) (end -2.5 -2.075)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.5 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.5 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 3 -2) (size 0.6 1.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.45 1.8) (size 0.6 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 4.45 1.8) (size 0.6 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 201070d5-a1f0-447f-ab5d-840dde369cc5)
   )
-  (fp_line (start 3.665 2.335) (end 3.89 2.335) (layer "F.SilkS") (width 0.12) (tstamp 020d5b26-60ad-4b0c-b383-9520d6fde2e7))
-  (fp_line (start -3.89 2.335) (end -3.665 2.335) (layer "F.SilkS") (width 0.12) (tstamp 0e0924d2-3706-41ba-b7a0-c70a1aa94d6f))
-  (fp_line (start -4.885 -2.185) (end -3.56 -2.185) (layer "F.SilkS") (width 0.12) (tstamp 1a51e0ee-9520-4a9e-8880-243d727bdcd0))
-  (fp_line (start -3.665 1.335) (end 3.665 1.335) (layer "F.SilkS") (width 0.12) (tstamp 3818b42b-f016-4c0e-b935-5e328da7abec))
-  (fp_line (start 3.665 1.335) (end 3.665 2.335) (layer "F.SilkS") (width 0.12) (tstamp 53ce3864-8198-4bc3-afa2-fff0da7e6e53))
-  (fp_line (start -3.665 2.335) (end -3.665 1.335) (layer "F.SilkS") (width 0.12) (tstamp 65ae4131-1ac1-430c-8ea4-b7aa4ec89c2c))
-  (fp_line (start 4.885 -2.185) (end 3.56 -2.185) (layer "F.SilkS") (width 0.12) (tstamp 714650f4-1472-4c98-b7bc-e98d99ac6f82))
-  (fp_line (start 4.885 0.815) (end 4.885 -2.185) (layer "F.SilkS") (width 0.12) (tstamp 775af26e-1084-40a1-8667-a92dcb653082))
-  (fp_line (start -3.56 -2.185) (end -3.56 -2.525) (layer "F.SilkS") (width 0.12) (tstamp 804627a0-cfd8-49f0-b6ca-09bbf0e02da5))
-  (fp_line (start -4.885 0.815) (end -4.885 -2.185) (layer "F.SilkS") (width 0.12) (tstamp fae382a5-ca96-414f-939c-71228a7174dd))
-  (fp_line (start -5.28 -3.02) (end -5.28 3.02) (layer "F.CrtYd") (width 0.05) (tstamp 1ce71aa9-2103-4c8f-afa3-079cdd527e4e))
-  (fp_line (start -5.28 3.02) (end 5.28 3.02) (layer "F.CrtYd") (width 0.05) (tstamp 64575e7c-a763-4af5-90d6-edcfc8db6b34))
-  (fp_line (start 5.28 3.02) (end 5.28 -3.02) (layer "F.CrtYd") (width 0.05) (tstamp e69bda0d-3fd5-4d94-99e3-19062bbdff41))
-  (fp_line (start 5.28 -3.02) (end -5.28 -3.02) (layer "F.CrtYd") (width 0.05) (tstamp f4a872ce-4cff-41ab-a742-23a90e680bb6))
-  (fp_line (start 4.775 -2.075) (end 4.775 2.225) (layer "F.Fab") (width 0.1) (tstamp 371b348b-e9d0-4d16-b313-7623cd66c18b))
-  (fp_line (start -3.775 1.225) (end 3.775 1.225) (layer "F.Fab") (width 0.1) (tstamp 7bfd05b1-49e6-4e37-ad72-546ce3ed1dd9))
-  (fp_line (start 3.775 1.225) (end 3.775 2.225) (layer "F.Fab") (width 0.1) (tstamp 8321295a-4af1-41d8-b5bd-e0208f54380b))
-  (fp_line (start -4.775 -2.075) (end -4.775 2.225) (layer "F.Fab") (width 0.1) (tstamp a3e96e8c-dcc3-460a-82e5-b7364957bec6))
-  (fp_line (start -3.775 2.225) (end -3.775 1.225) (layer "F.Fab") (width 0.1) (tstamp a7ac3273-511c-4f6b-bcaa-8a6f7e678cfd))
-  (fp_line (start -4.775 2.225) (end -3.775 2.225) (layer "F.Fab") (width 0.1) (tstamp ae296589-d22d-4718-96d6-78208dd0a47c))
-  (fp_line (start -3.5 -2.075) (end -3 -1.367893) (layer "F.Fab") (width 0.1) (tstamp bb3c5102-cf57-441a-9118-192df83dfe1c))
-  (fp_line (start -3 -1.367893) (end -2.5 -2.075) (layer "F.Fab") (width 0.1) (tstamp cb697631-8abe-4768-b4dc-05e50d46da82))
-  (fp_line (start 3.775 2.225) (end 4.775 2.225) (layer "F.Fab") (width 0.1) (tstamp e0b04a76-b3b4-4dff-a5b7-6b34414852af))
-  (fp_line (start -4.775 -2.075) (end 4.775 -2.075) (layer "F.Fab") (width 0.1) (tstamp f7cad7d2-e5cd-41e1-b350-0d82932070fa))
-  (pad "1" smd roundrect (at -3 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c31cda6a-059d-470e-93be-00e52ce46792))
-  (pad "2" smd roundrect (at -1.5 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bf4259bf-b3c3-4ab2-ab1a-0f1d5a25a4d9))
-  (pad "3" smd roundrect (at 0 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e21dc270-2f15-4f1f-8cee-61f0c6bad58e))
-  (pad "4" smd roundrect (at 1.5 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e0638008-f4b5-4079-8fb7-476b99ae89e3))
-  (pad "5" smd roundrect (at 3 -2) (size 0.6 1.05) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9c6885c5-b2e9-4a45-a2a1-5984ea9d45b1))
-  (pad "MP" smd roundrect (at -4.45 1.8) (size 0.6 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b8c3adad-ecb1-4883-a16a-53647fc4859a))
-  (pad "MP" smd roundrect (at 4.45 1.8) (size 0.6 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp be3938cc-2983-459d-a9a7-a90421d8fb39))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_AUH_BM05B-AUHKS-GA-TB_1x05-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical.kicad_mod
index 07295f318..1f84674ad 100644
--- a/Connector_JST.pretty/JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,50 +1,70 @@
-(footprint "JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM02B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0715b6a5-b67f-40f1-afc1-57ed296159b3)
   )
-  (fp_text value "JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8ca5d2ac-fc37-42bd-bbfe-a5f0fa61eb70)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -2.875 1.75) (end 2.875 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.985 0.26) (end -2.985 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.985 1.86) (end -1.185 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.185 1.86) (end -1.185 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.985 0.26) (end 2.985 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.985 1.86) (end 1.185 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.715 -2.61) (end 1.715 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.875 -2.5) (end 2.875 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 1.75) (end -2.875 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 1.75) (end 2.875 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 -0.5) (end -0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 0) (end -0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 0) (end -0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 -0.5) (end -0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 -0.5) (end 0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 0) (end 0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 0) (end 0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 -0.5) (end 0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.48 -3.3) (end -3.48 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.48 3.3) (end 3.48 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.48 3.3) (end 3.48 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.48 -3.3) (end -3.48 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.125 1.75) (end -0.625 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.625 1.042893) (end -0.125 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.475 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 2.475 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c09eeab9-4e20-4d56-9436-f579d39eeb0e)
   )
-  (fp_line (start -2.985 0.26) (end -2.985 1.86) (layer "F.SilkS") (width 0.12) (tstamp 3d968061-48fd-47d7-9c7c-9957917f8a2b))
-  (fp_line (start 2.985 1.86) (end 1.185 1.86) (layer "F.SilkS") (width 0.12) (tstamp 426a4eb1-dfb0-430e-82a9-22f2ee42287b))
-  (fp_line (start -1.715 -2.61) (end 1.715 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 4497a7fc-5000-4fcf-8c14-4034651b3d24))
-  (fp_line (start -2.985 1.86) (end -1.185 1.86) (layer "F.SilkS") (width 0.12) (tstamp 9bd4e85c-9e79-44c2-903d-c2914518fcf1))
-  (fp_line (start 2.985 0.26) (end 2.985 1.86) (layer "F.SilkS") (width 0.12) (tstamp bbffbb6e-2d03-4cae-916e-237453d4595d))
-  (fp_line (start -1.185 1.86) (end -1.185 2.8) (layer "F.SilkS") (width 0.12) (tstamp f5f0e757-2e34-452a-b52f-c9c98bfa3fc6))
-  (fp_line (start 3.48 3.3) (end 3.48 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 053831db-2cb2-4515-90ab-de6b366bc4f8))
-  (fp_line (start -3.48 -3.3) (end -3.48 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 29e6221d-9c68-4aa0-ba7d-d7613ebaf8ee))
-  (fp_line (start 3.48 -3.3) (end -3.48 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 9c9ddcbb-6f02-4cd3-9fbc-9abedbaa9365))
-  (fp_line (start -3.48 3.3) (end 3.48 3.3) (layer "F.CrtYd") (width 0.05) (tstamp d9d51a5a-7a02-43fb-b80a-39405f3a36a9))
-  (fp_line (start -2.875 -2.5) (end 2.875 -2.5) (layer "F.Fab") (width 0.1) (tstamp 2ebfc244-392b-46c5-a79e-46ff6920e7cc))
-  (fp_line (start -2.875 1.75) (end 2.875 1.75) (layer "F.Fab") (width 0.1) (tstamp 35711529-e0a5-48c4-94fa-1b445940465e))
-  (fp_line (start -1.125 1.75) (end -0.625 1.042893) (layer "F.Fab") (width 0.1) (tstamp 3cf21e3d-8299-4324-a4f1-2266aede46bf))
-  (fp_line (start -0.625 1.042893) (end -0.125 1.75) (layer "F.Fab") (width 0.1) (tstamp 4d7ba281-b9c3-465a-8743-6fe69db7c39d))
-  (fp_line (start 0.375 0) (end 0.875 0) (layer "F.Fab") (width 0.1) (tstamp 4f94db6d-9a81-4f94-ab11-f97c297ecde0))
-  (fp_line (start -2.875 1.75) (end -2.875 -2.5) (layer "F.Fab") (width 0.1) (tstamp 67c27d47-6342-4e6d-a42f-5d455ff1a18f))
-  (fp_line (start -0.375 0) (end -0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 79357968-28a8-4e2b-8fbf-a5d9ccaa2f8c))
-  (fp_line (start 0.375 -0.5) (end 0.375 0) (layer "F.Fab") (width 0.1) (tstamp 87502c4b-d0bb-4c53-ab26-4e9bd6fc4c47))
-  (fp_line (start 0.875 -0.5) (end 0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 89746f5e-7473-4f80-a376-ee25672c6d85))
-  (fp_line (start 0.875 0) (end 0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp a38c94ea-f8e5-414e-9ddd-7ec1481b67eb))
-  (fp_line (start -0.875 0) (end -0.375 0) (layer "F.Fab") (width 0.1) (tstamp bd810478-ab6e-484e-b633-233dd4ed0372))
-  (fp_line (start -0.875 -0.5) (end -0.875 0) (layer "F.Fab") (width 0.1) (tstamp c7a8d89a-3daf-4442-aec4-595ba918a64b))
-  (fp_line (start -0.375 -0.5) (end -0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp dcfbf1ea-4779-4eb9-be87-379874d37761))
-  (fp_line (start 2.875 1.75) (end 2.875 -2.5) (layer "F.Fab") (width 0.1) (tstamp e05cefe6-a032-45c9-b3f3-36102fac4685))
-  (pad "1" smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 012ba5ce-cb1c-4dfa-85cf-f4bf023b948b))
-  (pad "2" smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5ad5f874-f8c8-4af3-b7bd-ef9e15055273))
-  (pad "MP" smd roundrect (at -2.475 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2824b5f6-cbe1-4517-bbc9-7aad00ba547d))
-  (pad "MP" smd roundrect (at 2.475 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8f35bee5-6236-4416-bed5-2e0fd0b5975d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM02B-GHS-TBT_1x02-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical.kicad_mod
index b277be54f..ed115b5e3 100644
--- a/Connector_JST.pretty/JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,55 +1,79 @@
-(footprint "JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM03B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c48d6322-4544-4943-bbae-d99765ba6f0b)
   )
-  (fp_text value "JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 87263900-dff5-438c-a57f-8f48f7f9364c)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -3.5 1.75) (end 3.5 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.61 0.26) (end -3.61 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.61 1.86) (end -1.81 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.81 1.86) (end -1.81 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 0.26) (end 3.61 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 1.86) (end 1.81 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.34 -2.61) (end 2.34 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.5 -2.5) (end 3.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 1.75) (end -3.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 1.75) (end 3.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.5) (end -1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 0) (end 1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 -0.5) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.1 -3.3) (end -4.1 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.1 3.3) (end 4.1 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.1 3.3) (end 4.1 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.1 -3.3) (end -4.1 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.75 1.75) (end -1.25 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 1.042893) (end -0.75 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.1 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.1 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 51daa59b-6c52-4c11-8db8-31ede4fdd89f)
   )
-  (fp_line (start 3.61 1.86) (end 1.81 1.86) (layer "F.SilkS") (width 0.12) (tstamp 09f023eb-f3f8-448b-88bc-39bf44c59626))
-  (fp_line (start -1.81 1.86) (end -1.81 2.8) (layer "F.SilkS") (width 0.12) (tstamp 12bc96fb-c59c-4ac0-ac3e-406bc9e9ead4))
-  (fp_line (start -2.34 -2.61) (end 2.34 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 6cfa4cfe-da14-45f5-abbc-e995572eac42))
-  (fp_line (start -3.61 1.86) (end -1.81 1.86) (layer "F.SilkS") (width 0.12) (tstamp 82beb59d-45af-4276-9e1b-e0477367aaa6))
-  (fp_line (start 3.61 0.26) (end 3.61 1.86) (layer "F.SilkS") (width 0.12) (tstamp 863d3601-6069-4ee1-b6c3-9e84a5efb4b9))
-  (fp_line (start -3.61 0.26) (end -3.61 1.86) (layer "F.SilkS") (width 0.12) (tstamp adf8e013-1568-4b87-a1f9-1a550236ba75))
-  (fp_line (start -4.1 -3.3) (end -4.1 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 4c7ad025-e771-4cfd-bac8-7984edd3f702))
-  (fp_line (start -4.1 3.3) (end 4.1 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 9137c75a-bd1d-4883-80f5-a7c0f3001df3))
-  (fp_line (start 4.1 3.3) (end 4.1 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp ad7f9423-e05a-480a-a51a-e27ad46cc92c))
-  (fp_line (start 4.1 -3.3) (end -4.1 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp e84011f8-5827-40e3-b340-00c33fca2a77))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 03eca966-61fe-4f3f-8e84-9b3930c68497))
-  (fp_line (start -1 0) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 04c5ef13-2601-4640-95dd-730cc00e5909))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2b2ea6b5-9bf7-4227-a7b2-740485f70229))
-  (fp_line (start -1.5 -0.5) (end -1.5 0) (layer "F.Fab") (width 0.1) (tstamp 35e11037-a203-4672-875b-5137746b0bea))
-  (fp_line (start 1.5 0) (end 1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3cca2c53-e14e-49c4-9c6d-49e4b0b8dd62))
-  (fp_line (start -1.75 1.75) (end -1.25 1.042893) (layer "F.Fab") (width 0.1) (tstamp 3d3b4bf4-af7b-4465-b167-089cd40d23cb))
-  (fp_line (start -1.5 0) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 5deb2ef6-691a-4552-b31d-019ae6fc0752))
-  (fp_line (start -1 -0.5) (end -1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 632fe19d-be88-4898-803e-608e7c0f389e))
-  (fp_line (start -3.5 1.75) (end -3.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp 96a7188f-9bef-479e-948e-c5b03ef61dfb))
-  (fp_line (start 1.5 -0.5) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 976d5e50-8840-45c8-8abb-ee015f1edafe))
-  (fp_line (start 1 0) (end 1.5 0) (layer "F.Fab") (width 0.1) (tstamp a847bd7e-a00a-4d76-8503-aadbfe013247))
-  (fp_line (start -3.5 -2.5) (end 3.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp b68a48fb-0b8f-4422-be29-92633946731b))
-  (fp_line (start 3.5 1.75) (end 3.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp ba4da315-ded9-41f1-bf5a-18f2fb11178f))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp bc30246c-ff0e-41d0-bb45-6be098385ca1))
-  (fp_line (start -3.5 1.75) (end 3.5 1.75) (layer "F.Fab") (width 0.1) (tstamp cc821e86-e8ec-47a3-93dd-9956800ed193))
-  (fp_line (start 1 -0.5) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp f2654090-372b-482b-836c-044649cb885c))
-  (fp_line (start -1.25 1.042893) (end -0.75 1.75) (layer "F.Fab") (width 0.1) (tstamp f7e3b667-fe63-4686-b6e4-2102825fb092))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp fc17768a-0339-46f0-be4d-24a22137ed8b))
-  (pad "1" smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5cadc37e-e329-4708-95b8-c22de67132be))
-  (pad "2" smd roundrect (at 0 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2bd2f6ab-72a7-48c3-be56-e1cb7fd7c6c0))
-  (pad "3" smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d02eb4c-6ecb-4c5b-93ae-506ae7ff8c5c))
-  (pad "MP" smd roundrect (at -3.1 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 27bc15b4-a399-4860-9697-1423eb00bbf6))
-  (pad "MP" smd roundrect (at 3.1 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8571a641-75a2-428c-baa8-7b568cb13b87))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM03B-GHS-TBT_1x03-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical.kicad_mod
index 8cebd8219..6315b542c 100644
--- a/Connector_JST.pretty/JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,60 +1,88 @@
-(footprint "JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM04B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 41602118-0db9-4f45-a492-7a1c595ec7c0)
   )
-  (fp_text value "JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6494a8a2-e8af-445c-bc25-17043fb7acfe)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -4.125 1.75) (end 4.125 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.235 0.26) (end -4.235 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.235 1.86) (end -2.435 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.435 1.86) (end -2.435 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.235 0.26) (end 4.235 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.235 1.86) (end 2.435 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.965 -2.61) (end 2.965 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.125 -2.5) (end 4.125 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 1.75) (end -4.125 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 1.75) (end 4.125 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 -0.5) (end -2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 0) (end -1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 0) (end -1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 -0.5) (end -2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 -0.5) (end -0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 0) (end -0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 0) (end -0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 -0.5) (end -0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 -0.5) (end 0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 0) (end 0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 0) (end 0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 -0.5) (end 0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 -0.5) (end 1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 0) (end 2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 0) (end 2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 -0.5) (end 1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.72 -3.3) (end -4.72 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.72 3.3) (end 4.72 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.72 3.3) (end 4.72 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.72 -3.3) (end -4.72 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.375 1.75) (end -1.875 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.875 1.042893) (end -1.375 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.725 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.725 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp deb6199d-73a9-4323-9b72-43745c7c5865)
   )
-  (fp_line (start -4.235 1.86) (end -2.435 1.86) (layer "F.SilkS") (width 0.12) (tstamp 43659606-67be-461b-81c2-969d5587db11))
-  (fp_line (start -4.235 0.26) (end -4.235 1.86) (layer "F.SilkS") (width 0.12) (tstamp 826a106a-c4c2-473b-93ae-f53bc764ef40))
-  (fp_line (start 4.235 0.26) (end 4.235 1.86) (layer "F.SilkS") (width 0.12) (tstamp 9f53c907-9f7d-430e-a4fb-12adc3860e7c))
-  (fp_line (start 4.235 1.86) (end 2.435 1.86) (layer "F.SilkS") (width 0.12) (tstamp b9838d69-904e-477a-9486-3322df13431b))
-  (fp_line (start -2.965 -2.61) (end 2.965 -2.61) (layer "F.SilkS") (width 0.12) (tstamp c1a0df8e-7fea-4bcf-97a0-d15670d97715))
-  (fp_line (start -2.435 1.86) (end -2.435 2.8) (layer "F.SilkS") (width 0.12) (tstamp c6cc87be-5118-4a33-b968-6514226ab99d))
-  (fp_line (start 4.72 -3.3) (end -4.72 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 0319f7d3-9078-44a3-b31a-8a6f7639b138))
-  (fp_line (start 4.72 3.3) (end 4.72 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 6a1c3ce6-f286-4178-b9cf-414c62d48f1e))
-  (fp_line (start -4.72 3.3) (end 4.72 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 6f4f28ac-8ef8-42bf-8155-04ce16755782))
-  (fp_line (start -4.72 -3.3) (end -4.72 3.3) (layer "F.CrtYd") (width 0.05) (tstamp edda5686-7bfa-45ff-9e6d-652ae48093b1))
-  (fp_line (start -1.875 1.042893) (end -1.375 1.75) (layer "F.Fab") (width 0.1) (tstamp 002e183c-a389-4f50-80bc-e774620cb7f3))
-  (fp_line (start -2.125 -0.5) (end -2.125 0) (layer "F.Fab") (width 0.1) (tstamp 0e7916ef-82d4-419e-afaa-0bcf9b98ad76))
-  (fp_line (start 2.125 0) (end 2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0e7cc607-c797-4405-bc1e-d41ed3569436))
-  (fp_line (start -1.625 -0.5) (end -2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 15ae438f-e1d8-4356-8fc4-e50dafe69323))
-  (fp_line (start -0.875 0) (end -0.375 0) (layer "F.Fab") (width 0.1) (tstamp 182cc484-ee9b-4b52-82df-114488c1f27d))
-  (fp_line (start 0.875 -0.5) (end 0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1841ba71-7d4e-4d14-b175-c7c98f74ea8e))
-  (fp_line (start 4.125 1.75) (end 4.125 -2.5) (layer "F.Fab") (width 0.1) (tstamp 24188f97-e3a6-4ae4-92a5-faf049159706))
-  (fp_line (start -2.125 0) (end -1.625 0) (layer "F.Fab") (width 0.1) (tstamp 28ae124a-91c4-4aa1-a01f-51b4dce4e7c7))
-  (fp_line (start 1.625 -0.5) (end 1.625 0) (layer "F.Fab") (width 0.1) (tstamp 35aff072-a4df-4aca-947e-ce0741e6da1a))
-  (fp_line (start -0.375 -0.5) (end -0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3d9d9c73-c555-4298-ac2b-babd79bd39f3))
-  (fp_line (start -1.625 0) (end -1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 517ab911-daa5-49d0-a08e-4bf9e5536a98))
-  (fp_line (start -0.375 0) (end -0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5a802dc0-f533-48e1-8027-f89e5da8884b))
-  (fp_line (start 0.375 0) (end 0.875 0) (layer "F.Fab") (width 0.1) (tstamp 614bd30e-a840-4187-9bd2-a4e6ce334dc1))
-  (fp_line (start -4.125 1.75) (end 4.125 1.75) (layer "F.Fab") (width 0.1) (tstamp 68e3c1f5-7be5-4e8f-b471-ca4a7b8a8f79))
-  (fp_line (start 1.625 0) (end 2.125 0) (layer "F.Fab") (width 0.1) (tstamp 75923924-070c-4d22-8df7-ffe22595dbb6))
-  (fp_line (start -2.375 1.75) (end -1.875 1.042893) (layer "F.Fab") (width 0.1) (tstamp 9b7130d6-d4df-4c1b-aa2c-ff230b717c97))
-  (fp_line (start -0.875 -0.5) (end -0.875 0) (layer "F.Fab") (width 0.1) (tstamp 9d883d20-9b25-4f49-89bc-dbee6580ec92))
-  (fp_line (start -4.125 1.75) (end -4.125 -2.5) (layer "F.Fab") (width 0.1) (tstamp a3942a75-46c4-4b86-911d-8caeccd78b0b))
-  (fp_line (start 2.125 -0.5) (end 1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp a8f66530-6da7-4100-93d2-2f3ad8f72b76))
-  (fp_line (start 0.875 0) (end 0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp ab7404e6-edff-42b7-b5b5-e33124a5a56b))
-  (fp_line (start -4.125 -2.5) (end 4.125 -2.5) (layer "F.Fab") (width 0.1) (tstamp b0be869c-1d3b-4a0e-8e9a-849e29f994ae))
-  (fp_line (start 0.375 -0.5) (end 0.375 0) (layer "F.Fab") (width 0.1) (tstamp c1ceabd8-18a5-4de6-9d2f-799e949538a2))
-  (pad "1" smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3990458a-ddc4-4b9c-b61a-de097b398dcd))
-  (pad "2" smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7e1b92df-558b-40dc-a6ee-e2e616c3c283))
-  (pad "3" smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1c0752d8-e795-4ab9-b1e5-0d7a88343153))
-  (pad "4" smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0d9ecc73-ecc2-48d5-ad88-6f8fb509d6d3))
-  (pad "MP" smd roundrect (at -3.725 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3dc862a9-7f59-4556-ac43-be3d46547c89))
-  (pad "MP" smd roundrect (at 3.725 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 75358baf-1b9b-4ddb-8eaf-accac6c308bb))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM04B-GHS-TBT_1x04-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical.kicad_mod
index 556b8f63f..92e1ea6b5 100644
--- a/Connector_JST.pretty/JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,65 +1,97 @@
-(footprint "JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM05B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a948ee23-3d47-4a57-92ef-4b601908f1f3)
   )
-  (fp_text value "JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e3dd6e69-6f00-401d-9c79-4c8fbe58512c)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -4.75 1.75) (end 4.75 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.86 0.26) (end -4.86 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.86 1.86) (end -3.06 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.06 1.86) (end -3.06 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.86 0.26) (end 4.86 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.86 1.86) (end 3.06 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.59 -2.61) (end 3.59 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.75 -2.5) (end 4.75 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 1.75) (end -4.75 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 1.75) (end 4.75 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 0) (end -2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -0.5) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.5) (end -1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 0) (end 1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 -0.5) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -0.5) (end 2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 0) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.35 -3.3) (end -5.35 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.35 3.3) (end 5.35 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.35 3.3) (end 5.35 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.35 -3.3) (end -5.35 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3 1.75) (end -2.5 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 1.042893) (end -2 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.35 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 4.35 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 448822e9-7db6-4a9c-897c-d2f5fb44fb6a)
   )
-  (fp_line (start -4.86 0.26) (end -4.86 1.86) (layer "F.SilkS") (width 0.12) (tstamp 2cdedb69-7a32-4c6a-a70f-e65673612696))
-  (fp_line (start -3.59 -2.61) (end 3.59 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 3cfbb842-6513-427e-b389-26a095b8a578))
-  (fp_line (start 4.86 1.86) (end 3.06 1.86) (layer "F.SilkS") (width 0.12) (tstamp 44349c71-2a03-45c4-8876-f7c1bd3840fe))
-  (fp_line (start -4.86 1.86) (end -3.06 1.86) (layer "F.SilkS") (width 0.12) (tstamp 93ac7ad0-a4f7-44dd-8133-cc0fe75bc48b))
-  (fp_line (start 4.86 0.26) (end 4.86 1.86) (layer "F.SilkS") (width 0.12) (tstamp ba022f78-afef-4ecd-aa39-fcda24eb93d7))
-  (fp_line (start -3.06 1.86) (end -3.06 2.8) (layer "F.SilkS") (width 0.12) (tstamp bde5465d-2aa3-4f64-9e98-2c2f268e1927))
-  (fp_line (start -5.35 -3.3) (end -5.35 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 41396fb3-74b8-496f-ae0a-e2ccb6572a53))
-  (fp_line (start 5.35 3.3) (end 5.35 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 45a90642-45f6-4f06-a042-60ad856807ad))
-  (fp_line (start -5.35 3.3) (end 5.35 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 756a5ad3-e071-4067-95da-402b9c9cacf7))
-  (fp_line (start 5.35 -3.3) (end -5.35 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp f6735492-0078-4b13-ba38-50b6baf6cfae))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp 014b7df6-d2ca-454d-bebc-90c5e456fb8b))
-  (fp_line (start -1.5 0) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 044d3f70-f5a8-4c83-90f9-c9ef5e2c2665))
-  (fp_line (start 1 0) (end 1.5 0) (layer "F.Fab") (width 0.1) (tstamp 04baf69f-5067-4085-8556-ccd9a26be349))
-  (fp_line (start 2.25 0) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 28ab2477-9b8c-49cc-8a52-5db04ceb5e36))
-  (fp_line (start 2.75 0) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2af417d7-5912-45f8-968f-e06f5c0c3778))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2ccc959b-f80b-4fbc-ab64-e81de338ace2))
-  (fp_line (start -1 0) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 30a704cf-b59b-4a6e-956a-dc2935f691b1))
-  (fp_line (start 1 -0.5) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 38c9c18d-4be9-4622-bc1b-6624ad5413cc))
-  (fp_line (start -1.5 -0.5) (end -1.5 0) (layer "F.Fab") (width 0.1) (tstamp 3fb2e4e2-c8cd-4e11-bba8-1d88ba77d1ee))
-  (fp_line (start -2.75 0) (end -2.25 0) (layer "F.Fab") (width 0.1) (tstamp 44095c51-eaa3-462e-9d8e-fddd115dcfbc))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4e09d072-3429-4ef2-9468-e787518033ec))
-  (fp_line (start -4.75 -2.5) (end 4.75 -2.5) (layer "F.Fab") (width 0.1) (tstamp 4ecb79b1-cc72-4870-924c-f0953dcce4c0))
-  (fp_line (start 1.5 0) (end 1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6ae963f8-b0f3-4783-9a0d-e39f66a70bcc))
-  (fp_line (start 4.75 1.75) (end 4.75 -2.5) (layer "F.Fab") (width 0.1) (tstamp 6cd0bef3-9133-4e01-a750-2952830871ee))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 72e4d20b-9832-4082-924a-e95fbc7f337c))
-  (fp_line (start 2.75 -0.5) (end 2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 76f38a9d-0488-4629-9334-9bd5982823a8))
-  (fp_line (start -2.5 1.042893) (end -2 1.75) (layer "F.Fab") (width 0.1) (tstamp 77a84fa5-3d2a-4b57-a0be-fc8b8d236b44))
-  (fp_line (start -4.75 1.75) (end -4.75 -2.5) (layer "F.Fab") (width 0.1) (tstamp 81396ad7-2495-472d-9fe5-395216171d73))
-  (fp_line (start -2.25 0) (end -2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 89c660ab-3945-403e-83ef-c6d8d46fe4ea))
-  (fp_line (start -2.25 -0.5) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 948bbde2-d9eb-466a-9349-2128c044aee1))
-  (fp_line (start -4.75 1.75) (end 4.75 1.75) (layer "F.Fab") (width 0.1) (tstamp d41f7488-23ea-4e03-9633-032d0c70f062))
-  (fp_line (start -3 1.75) (end -2.5 1.042893) (layer "F.Fab") (width 0.1) (tstamp d9194b3f-2f0e-4302-a914-324dd1b36e7a))
-  (fp_line (start -1 -0.5) (end -1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e96e0506-aa27-4875-881b-3ec9ff5816ff))
-  (fp_line (start -2.75 -0.5) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp effa22c3-85ba-4772-a7be-88e185a946a3))
-  (fp_line (start 1.5 -0.5) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp f3157371-cc10-47cb-9115-70fd4134a602))
-  (fp_line (start 2.25 -0.5) (end 2.25 0) (layer "F.Fab") (width 0.1) (tstamp f32c69af-cf65-44b3-aa01-cd8820827668))
-  (pad "1" smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f9a527fc-2a65-44bd-8c2f-bddc93b0c9b0))
-  (pad "2" smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb75649e-7715-4092-96ea-5dcc69e68047))
-  (pad "3" smd roundrect (at 0 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 075cf18a-8676-41d4-8a82-7c426bb2443c))
-  (pad "4" smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 885d42f7-c47e-4040-a35f-45c1f5b40711))
-  (pad "5" smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6ccffc40-c4e5-4c49-b5ad-b0376a6c3404))
-  (pad "MP" smd roundrect (at 4.35 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4eefcd96-b500-47fe-9a76-75632b0a7d89))
-  (pad "MP" smd roundrect (at -4.35 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6133bc80-4f07-489b-a633-ac2b51d3f747))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM05B-GHS-TBT_1x05-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical.kicad_mod
index d4e23e1d2..0ee210ed0 100644
--- a/Connector_JST.pretty/JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,70 +1,106 @@
-(footprint "JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM06B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9c593fdb-91e2-4a31-a14e-a438824d1c04)
   )
-  (fp_text value "JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4579a6d2-da83-40b5-9769-da270e44c772)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -5.375 1.75) (end 5.375 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.485 0.26) (end -5.485 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.485 1.86) (end -3.685 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.685 1.86) (end -3.685 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.485 0.26) (end 5.485 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.485 1.86) (end 3.685 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.215 -2.61) (end 4.215 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.375 -2.5) (end 5.375 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 1.75) (end -5.375 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 1.75) (end 5.375 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 -0.5) (end -3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 0) (end -2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 0) (end -2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 -0.5) (end -3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 -0.5) (end -2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 0) (end -1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 0) (end -1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 -0.5) (end -2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 -0.5) (end -0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 0) (end -0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 0) (end -0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 -0.5) (end -0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 -0.5) (end 0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 0) (end 0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 0) (end 0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 -0.5) (end 0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 -0.5) (end 1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 0) (end 2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 0) (end 2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 -0.5) (end 1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 -0.5) (end 2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 0) (end 3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 0) (end 3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 -0.5) (end 2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.98 -3.3) (end -5.98 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.98 3.3) (end 5.98 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.98 3.3) (end 5.98 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.98 -3.3) (end -5.98 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.625 1.75) (end -3.125 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.125 1.042893) (end -2.625 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.975 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 4.975 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 038c6b77-384c-463a-a4bf-1cd6070cb648)
   )
-  (fp_line (start -5.485 1.86) (end -3.685 1.86) (layer "F.SilkS") (width 0.12) (tstamp 88633983-836b-4672-8a13-144090e41c48))
-  (fp_line (start 5.485 1.86) (end 3.685 1.86) (layer "F.SilkS") (width 0.12) (tstamp 95479973-1cca-4ff4-9ed0-fe76d7dee716))
-  (fp_line (start -5.485 0.26) (end -5.485 1.86) (layer "F.SilkS") (width 0.12) (tstamp 987310a9-e4d8-49c7-8b39-b7cb358be4fa))
-  (fp_line (start -4.215 -2.61) (end 4.215 -2.61) (layer "F.SilkS") (width 0.12) (tstamp d88a8e86-717d-4367-916d-78d5dcf64ebb))
-  (fp_line (start 5.485 0.26) (end 5.485 1.86) (layer "F.SilkS") (width 0.12) (tstamp e738b04d-22eb-4ea5-a41c-9a62c3051244))
-  (fp_line (start -3.685 1.86) (end -3.685 2.8) (layer "F.SilkS") (width 0.12) (tstamp e873081d-fb44-4da6-8358-e72c16892363))
-  (fp_line (start -5.98 3.3) (end 5.98 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 2846c700-990e-44f6-81b4-0bf40e5e2b94))
-  (fp_line (start 5.98 -3.3) (end -5.98 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp dbadd628-e42a-403f-88cd-bcaf4f8cbc5d))
-  (fp_line (start 5.98 3.3) (end 5.98 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp e2409791-9524-479b-9c9b-673804eebc0d))
-  (fp_line (start -5.98 -3.3) (end -5.98 3.3) (layer "F.CrtYd") (width 0.05) (tstamp eb0bc947-2a4b-4ac3-bbd9-20f7068244af))
-  (fp_line (start -0.375 -0.5) (end -0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 095a9182-a7d8-4f77-ac0a-33ab571bfcac))
-  (fp_line (start 2.125 0) (end 2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0ba2121f-c657-4716-b639-b7778e316c7a))
-  (fp_line (start -1.625 -0.5) (end -2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1b680529-ed8a-4600-a809-1ab1092e4050))
-  (fp_line (start 2.125 -0.5) (end 1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2686a56e-f68a-40be-a98c-af8bd6d8d576))
-  (fp_line (start -2.875 -0.5) (end -3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2859431d-1ee4-4af3-8d96-25188ff0b25a))
-  (fp_line (start 5.375 1.75) (end 5.375 -2.5) (layer "F.Fab") (width 0.1) (tstamp 306a0028-66f5-4c07-b324-f128d18da981))
-  (fp_line (start 2.875 -0.5) (end 2.875 0) (layer "F.Fab") (width 0.1) (tstamp 306eaf4d-252b-43f8-bb65-18aed6acf074))
-  (fp_line (start 0.375 -0.5) (end 0.375 0) (layer "F.Fab") (width 0.1) (tstamp 5472c955-6687-4469-be2e-e4070c155ee8))
-  (fp_line (start -0.375 0) (end -0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 54ffe3c4-23fd-41ac-9ec2-c1dde155a05d))
-  (fp_line (start 3.375 0) (end 3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 56301cb0-97b2-4f49-b7a9-d547f18ea2b7))
-  (fp_line (start 0.875 -0.5) (end 0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5e7ed1b2-b7fd-40b9-827e-e5b4ddbfff58))
-  (fp_line (start -2.125 -0.5) (end -2.125 0) (layer "F.Fab") (width 0.1) (tstamp 68a41dc6-700b-4d80-8616-ef7ce06b07f3))
-  (fp_line (start -3.375 0) (end -2.875 0) (layer "F.Fab") (width 0.1) (tstamp 6bd09157-6aee-4d4e-a2ad-3321817ecb22))
-  (fp_line (start -5.375 1.75) (end -5.375 -2.5) (layer "F.Fab") (width 0.1) (tstamp 76082dd9-34b4-41e2-a868-4fe78b99153f))
-  (fp_line (start 1.625 -0.5) (end 1.625 0) (layer "F.Fab") (width 0.1) (tstamp 7d5b6d44-5a06-44ce-ad8a-4f48adace270))
-  (fp_line (start -0.875 0) (end -0.375 0) (layer "F.Fab") (width 0.1) (tstamp 85c0af87-cb49-4c85-974a-8c70b0e0d862))
-  (fp_line (start 2.875 0) (end 3.375 0) (layer "F.Fab") (width 0.1) (tstamp 8f4d69c9-8842-4cec-a28f-588a8153fa4e))
-  (fp_line (start -5.375 -2.5) (end 5.375 -2.5) (layer "F.Fab") (width 0.1) (tstamp 921f13ab-ff69-4a2d-81fd-bcc06831730c))
-  (fp_line (start -1.625 0) (end -1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9d8c2857-a62f-403f-960b-3f885d3b17d1))
-  (fp_line (start -3.125 1.042893) (end -2.625 1.75) (layer "F.Fab") (width 0.1) (tstamp 9f2c51e1-4afa-467a-b708-c944e66312f4))
-  (fp_line (start -3.375 -0.5) (end -3.375 0) (layer "F.Fab") (width 0.1) (tstamp a03c5f90-bcab-4007-a284-19d7cbcf8e2c))
-  (fp_line (start 0.875 0) (end 0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp aca78c30-fdcb-4d4d-8b3f-58ad3a715d5f))
-  (fp_line (start -3.625 1.75) (end -3.125 1.042893) (layer "F.Fab") (width 0.1) (tstamp af57145a-c5a7-482a-905b-9e80f4d9a107))
-  (fp_line (start 3.375 -0.5) (end 2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp b40d3636-26ce-49fd-a87b-51155b9ac469))
-  (fp_line (start -0.875 -0.5) (end -0.875 0) (layer "F.Fab") (width 0.1) (tstamp c21502d3-f761-4299-9571-e4a0c7d7d0a3))
-  (fp_line (start 0.375 0) (end 0.875 0) (layer "F.Fab") (width 0.1) (tstamp da3a82e6-fb23-449a-9a22-63bda7d6d1a1))
-  (fp_line (start -5.375 1.75) (end 5.375 1.75) (layer "F.Fab") (width 0.1) (tstamp e6248193-8e87-453f-9d0a-dae9f9f8caf4))
-  (fp_line (start 1.625 0) (end 2.125 0) (layer "F.Fab") (width 0.1) (tstamp f0f6ffd5-3df7-474f-bff8-51ac4720080b))
-  (fp_line (start -2.875 0) (end -2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp f55837f5-277e-4da8-8616-a3b913bec3fa))
-  (fp_line (start -2.125 0) (end -1.625 0) (layer "F.Fab") (width 0.1) (tstamp fddb8ff7-8e91-4fec-86f4-8801ce049c20))
-  (pad "1" smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 427f3b83-40ad-4c28-9230-953dd69ea67b))
-  (pad "2" smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f3de84b-697f-4731-88af-cd36e74a2414))
-  (pad "3" smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0c77dbb7-37f2-4e96-85f7-770e3e499b70))
-  (pad "4" smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f033902-c6a8-4dab-aa3b-577d251dee25))
-  (pad "5" smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 393b9439-316e-4917-b481-fb2f561e940b))
-  (pad "6" smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e75cffe9-6bdf-423d-9614-1e8b52c465e3))
-  (pad "MP" smd roundrect (at 4.975 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 75af440b-1126-468d-bf07-1f652348bfd4))
-  (pad "MP" smd roundrect (at -4.975 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d6ff9382-53df-436d-b3f9-b34e4bfedea9))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM06B-GHS-TBT_1x06-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical.kicad_mod
index 07d1d43a2..bd94bbcfd 100644
--- a/Connector_JST.pretty/JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,75 +1,115 @@
-(footprint "JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM07B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ddb51811-42bd-49b9-bcd9-a467a469360f)
   )
-  (fp_text value "JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7b022de4-46ca-402a-a53d-ca4cc500634b)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -6 1.75) (end 6 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.11 0.26) (end -6.11 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 1.86) (end -4.31 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.31 1.86) (end -4.31 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 0.26) (end 6.11 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 1.86) (end 4.31 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.84 -2.61) (end 4.84 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6 -2.5) (end 6 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 1.75) (end -6 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 1.75) (end 6 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 0) (end -2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -0.5) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.5) (end -1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 0) (end 1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 -0.5) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -0.5) (end 2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 0) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.6 -3.3) (end -6.6 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.6 3.3) (end 6.6 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.6 3.3) (end 6.6 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.6 -3.3) (end -6.6 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.25 1.75) (end -3.75 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 1.042893) (end -3.25 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.6 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 5.6 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 278642ff-568d-40f0-add0-440ae817be34)
   )
-  (fp_line (start 6.11 0.26) (end 6.11 1.86) (layer "F.SilkS") (width 0.12) (tstamp 4d4ba902-b594-4229-b5fd-14e45af69e53))
-  (fp_line (start -4.84 -2.61) (end 4.84 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 66cd2298-feb7-4cf8-a7d2-162840d85448))
-  (fp_line (start -4.31 1.86) (end -4.31 2.8) (layer "F.SilkS") (width 0.12) (tstamp 787d304f-d71e-4cb5-b067-33659d4eb134))
-  (fp_line (start -6.11 1.86) (end -4.31 1.86) (layer "F.SilkS") (width 0.12) (tstamp 8d56380e-b043-4daf-bfb5-e5ada2a95212))
-  (fp_line (start 6.11 1.86) (end 4.31 1.86) (layer "F.SilkS") (width 0.12) (tstamp d42c7ad3-0dad-41ec-be1d-b71e083e0555))
-  (fp_line (start -6.11 0.26) (end -6.11 1.86) (layer "F.SilkS") (width 0.12) (tstamp e4be3dbe-5f23-4cb7-87a8-6263bfd47e1e))
-  (fp_line (start -6.6 3.3) (end 6.6 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 971c5e52-75b0-4288-a932-9449b4c13096))
-  (fp_line (start 6.6 3.3) (end 6.6 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 990c0867-8d54-4dc1-a032-7828adf9fef9))
-  (fp_line (start -6.6 -3.3) (end -6.6 3.3) (layer "F.CrtYd") (width 0.05) (tstamp b1e1fab7-f042-44af-a1ef-25b5ceb5dfce))
-  (fp_line (start 6.6 -3.3) (end -6.6 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp f621f828-a6ac-44bb-8961-52b9f3c4c582))
-  (fp_line (start -2.75 0) (end -2.25 0) (layer "F.Fab") (width 0.1) (tstamp 0b99c73c-1513-4eea-90bd-2b131de75c6c))
-  (fp_line (start -6 1.75) (end 6 1.75) (layer "F.Fab") (width 0.1) (tstamp 0ffd5de3-b15b-409a-a198-b310bcaa1838))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 192f54bf-f0a6-4fff-a695-3cf8a6c0cb14))
-  (fp_line (start 1 -0.5) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 1b0015ca-e8d1-4528-89c6-ca3509415da7))
-  (fp_line (start -4.25 1.75) (end -3.75 1.042893) (layer "F.Fab") (width 0.1) (tstamp 1eb1c954-69b2-4be4-bdb3-d6f66b8e6601))
-  (fp_line (start -1.5 -0.5) (end -1.5 0) (layer "F.Fab") (width 0.1) (tstamp 2241eee0-78a7-4b05-8acd-2c04ffac32f3))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 23404651-3b46-453b-b17d-ebcf955ea6e8))
-  (fp_line (start -2.75 -0.5) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp 331fded1-5a68-4dc7-93ff-fa1d319e4302))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp 398c1444-d6c5-4695-b1ac-402372b761e6))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 41b2b10a-4253-4944-af10-e8eb23a1b30b))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp 4334e179-d699-4728-8e00-2ccda010a1f8))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp 46d69f4b-bfe6-4cd4-a720-d64a6d4c23c9))
-  (fp_line (start -2.25 0) (end -2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4734405e-692b-4f22-a1ec-2a6908e17916))
-  (fp_line (start -1 0) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 69960e6c-841f-486e-b50d-652afb82e191))
-  (fp_line (start -2.25 -0.5) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6eb1b4bc-5a12-4a08-9e1f-4a871dce6e35))
-  (fp_line (start 1 0) (end 1.5 0) (layer "F.Fab") (width 0.1) (tstamp 793ce9db-3c71-459f-8cab-d8c755e2c7df))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7c00b5c6-f9d7-4ed7-9238-09d3d8edc63a))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 825656a2-4d08-4314-b2e9-2d79fa8fead6))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 92325c9f-3750-4a1b-acdb-a83578643ece))
-  (fp_line (start -6 -2.5) (end 6 -2.5) (layer "F.Fab") (width 0.1) (tstamp 944839a3-4d4d-4251-ba6a-b3c98c4c284c))
-  (fp_line (start 2.25 -0.5) (end 2.25 0) (layer "F.Fab") (width 0.1) (tstamp 9f597a8d-2746-4f61-a31c-372929a17ecd))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp a70e0ece-2f92-4e15-96b1-95bcb9daacbe))
-  (fp_line (start 2.75 0) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp ade191af-612a-4869-b4d2-e363c74c69cc))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b716cb74-8074-4891-9551-a9b4fd3f7743))
-  (fp_line (start -1 -0.5) (end -1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp bd44300a-da9e-4b31-9908-9aadc747cb18))
-  (fp_line (start -3.75 1.042893) (end -3.25 1.75) (layer "F.Fab") (width 0.1) (tstamp bf963590-da65-40c3-b806-daf7d9746492))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp e8c4e55b-a7a3-4ccf-91f3-826b39a7e7ed))
-  (fp_line (start -6 1.75) (end -6 -2.5) (layer "F.Fab") (width 0.1) (tstamp e9377d89-e028-431e-b59e-9c000d36efc1))
-  (fp_line (start 2.75 -0.5) (end 2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp ea6010f1-d2b6-4795-b5ca-aee708b2f70f))
-  (fp_line (start 2.25 0) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp eb8fd26c-9c94-41af-9c62-48092019d0c1))
-  (fp_line (start -1.5 0) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp f3dbf0a6-fa35-4a60-911b-221df8a18d65))
-  (fp_line (start 1.5 -0.5) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp f7348e64-debb-4d2e-9f5c-559046d0cfdd))
-  (fp_line (start 6 1.75) (end 6 -2.5) (layer "F.Fab") (width 0.1) (tstamp f82459a3-e8ee-4c8c-93ba-617a53d57464))
-  (fp_line (start 1.5 0) (end 1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp f98ae41f-f3e5-4aec-bc91-db3bd6ab46ae))
-  (pad "1" smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 763be77e-ea6d-426d-bff8-928dc0784079))
-  (pad "2" smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a838524a-42a4-42ca-a340-6f56a8ca6a04))
-  (pad "3" smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2473e381-1018-47db-b5ef-7c1e56dad7c0))
-  (pad "4" smd roundrect (at 0 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 94ceac42-9445-4413-8292-107235205eee))
-  (pad "5" smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b4ec43a2-fa4f-420d-809c-fbf1ad19fd8c))
-  (pad "6" smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5a2b5913-9bed-45f0-9d5c-42dad6131ac8))
-  (pad "7" smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0521c4f7-dd42-4407-81ef-e072493fceb2))
-  (pad "MP" smd roundrect (at -5.6 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 25fa9105-3083-4201-80ac-bf75e5814061))
-  (pad "MP" smd roundrect (at 5.6 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4ad2e1de-a9d3-4fe3-a856-9cae6e33e75a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM07B-GHS-TBT_1x07-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical.kicad_mod
index a4c5aaa37..4f20f5022 100644
--- a/Connector_JST.pretty/JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,80 +1,124 @@
-(footprint "JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM08B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 16a1c816-47c4-4bec-8412-42547572483b)
   )
-  (fp_text value "JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 204496a6-1833-4ebf-bae1-cf5fa4976356)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -6.625 1.75) (end 6.625 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.735 0.26) (end -6.735 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.735 1.86) (end -4.935 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.935 1.86) (end -4.935 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.735 0.26) (end 6.735 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.735 1.86) (end 4.935 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.465 -2.61) (end 5.465 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.625 -2.5) (end 6.625 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.625 1.75) (end -6.625 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.625 1.75) (end 6.625 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 -0.5) (end -4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 0) (end -4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 0) (end -4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 -0.5) (end -4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 -0.5) (end -3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 0) (end -2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 0) (end -2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 -0.5) (end -3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 -0.5) (end -2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 0) (end -1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 0) (end -1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 -0.5) (end -2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 -0.5) (end -0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 0) (end -0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 0) (end -0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 -0.5) (end -0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 -0.5) (end 0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 0) (end 0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 0) (end 0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 -0.5) (end 0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 -0.5) (end 1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 0) (end 2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 0) (end 2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 -0.5) (end 1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 -0.5) (end 2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 0) (end 3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 0) (end 3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 -0.5) (end 2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 -0.5) (end 4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 0) (end 4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 0) (end 4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 -0.5) (end 4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.22 -3.3) (end -7.22 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.22 3.3) (end 7.22 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.22 3.3) (end 7.22 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.22 -3.3) (end -7.22 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.875 1.75) (end -4.375 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.375 1.042893) (end -3.875 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.225 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 6.225 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0af77f82-0ea4-4c20-b668-e90a8f2c7dad)
   )
-  (fp_line (start 6.735 1.86) (end 4.935 1.86) (layer "F.SilkS") (width 0.12) (tstamp 299841ea-27ea-44dc-97b6-cfd0b0e7dd69))
-  (fp_line (start -5.465 -2.61) (end 5.465 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 31412be6-11dc-4f2b-84ea-8bfff5e367c3))
-  (fp_line (start 6.735 0.26) (end 6.735 1.86) (layer "F.SilkS") (width 0.12) (tstamp 46e71a97-2f55-4f9b-b290-63f2ec0fd7c2))
-  (fp_line (start -4.935 1.86) (end -4.935 2.8) (layer "F.SilkS") (width 0.12) (tstamp 50fc10e5-ed10-4681-9455-035fc236f502))
-  (fp_line (start -6.735 0.26) (end -6.735 1.86) (layer "F.SilkS") (width 0.12) (tstamp c4ea295c-0abc-4a9a-bc0e-2303b5e89d5b))
-  (fp_line (start -6.735 1.86) (end -4.935 1.86) (layer "F.SilkS") (width 0.12) (tstamp eab4847f-729d-434c-921c-a0c4f30c0b55))
-  (fp_line (start -7.22 3.3) (end 7.22 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 52a14554-107a-4d1b-89eb-83a874a6b5dd))
-  (fp_line (start 7.22 -3.3) (end -7.22 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 596efb83-3088-4a61-8030-5176e34595f3))
-  (fp_line (start -7.22 -3.3) (end -7.22 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 690cfc51-ce5d-4c4c-9431-7037bafd9eaa))
-  (fp_line (start 7.22 3.3) (end 7.22 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp ffd57ca9-9e2a-4bce-9680-d6ff621ae5cb))
-  (fp_line (start -3.375 -0.5) (end -3.375 0) (layer "F.Fab") (width 0.1) (tstamp 0380f13f-9f89-4728-b75e-5ea6d5372b81))
-  (fp_line (start 1.625 0) (end 2.125 0) (layer "F.Fab") (width 0.1) (tstamp 06679cb7-bc09-4ec4-94d9-a332942ca759))
-  (fp_line (start 0.875 -0.5) (end 0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 077bb9bc-f928-4006-9d26-f28b6a4c09ec))
-  (fp_line (start -1.625 0) (end -1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 09960b1d-ef08-4456-9d19-81fc39adcc31))
-  (fp_line (start 2.875 -0.5) (end 2.875 0) (layer "F.Fab") (width 0.1) (tstamp 0b08c15a-5aca-4e49-9004-fd182e8dd584))
-  (fp_line (start -4.125 0) (end -4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0bcdb1b8-095b-44c6-80ec-0d3216733ff6))
-  (fp_line (start 4.625 0) (end 4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0c919189-8c51-4b65-9255-ec61175d7aff))
-  (fp_line (start 2.875 0) (end 3.375 0) (layer "F.Fab") (width 0.1) (tstamp 1114f8eb-b153-431c-bc2d-cac2762d2c83))
-  (fp_line (start -6.625 1.75) (end 6.625 1.75) (layer "F.Fab") (width 0.1) (tstamp 11423163-929c-4365-aaea-09b7b2c00c8f))
-  (fp_line (start -0.375 -0.5) (end -0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 12882456-7da0-47c6-938e-8e18b1b0a6d3))
-  (fp_line (start 2.125 0) (end 2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1485507f-08fe-468a-96de-652ab4131022))
-  (fp_line (start 2.125 -0.5) (end 1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 26512a58-5cef-4576-b875-5f038c7f1d7a))
-  (fp_line (start -0.875 0) (end -0.375 0) (layer "F.Fab") (width 0.1) (tstamp 3aea33eb-e8e9-4141-a32c-b3138eba559c))
-  (fp_line (start -2.875 0) (end -2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3cb88bfc-1a4d-4d8b-9644-f92d13810fe4))
-  (fp_line (start -6.625 1.75) (end -6.625 -2.5) (layer "F.Fab") (width 0.1) (tstamp 3ff3e0aa-5251-4c01-a1f4-7d4042a5ee50))
-  (fp_line (start -4.625 -0.5) (end -4.625 0) (layer "F.Fab") (width 0.1) (tstamp 4ef4b9c3-393c-48ea-b1a7-7e55f58cd716))
-  (fp_line (start 3.375 0) (end 3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 51f4a882-71e3-4c18-b33c-1b61df529e44))
-  (fp_line (start 4.125 -0.5) (end 4.125 0) (layer "F.Fab") (width 0.1) (tstamp 546b7673-e535-4d13-9516-55afd93190ac))
-  (fp_line (start 3.375 -0.5) (end 2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5547c32f-df00-4ceb-a63a-db5dcb2838cd))
-  (fp_line (start -2.875 -0.5) (end -3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 60d3bebf-7179-4b74-8fab-c140f17a9fc7))
-  (fp_line (start -4.125 -0.5) (end -4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 710c4a1d-de43-44a9-a799-7fb8a18adaaf))
-  (fp_line (start 0.375 0) (end 0.875 0) (layer "F.Fab") (width 0.1) (tstamp 71f38d32-6755-4355-8fd4-0c65a2e15d3b))
-  (fp_line (start 0.375 -0.5) (end 0.375 0) (layer "F.Fab") (width 0.1) (tstamp 72f3d30b-6288-418f-ad73-39706cdcebac))
-  (fp_line (start -4.625 0) (end -4.125 0) (layer "F.Fab") (width 0.1) (tstamp 8d9d63af-7424-44ef-8668-464b5e9fcb6c))
-  (fp_line (start -0.375 0) (end -0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 962d420a-0e35-4718-b716-28395cf8f943))
-  (fp_line (start -1.625 -0.5) (end -2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp a34de0e5-bddb-40e3-93dc-1a53c738b250))
-  (fp_line (start 0.875 0) (end 0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp a42f0b87-e922-48a4-b7b4-77eca0a7ddd0))
-  (fp_line (start -2.125 0) (end -1.625 0) (layer "F.Fab") (width 0.1) (tstamp c2eeacd5-6013-4711-9eb8-e7d1047dd3c3))
-  (fp_line (start -4.875 1.75) (end -4.375 1.042893) (layer "F.Fab") (width 0.1) (tstamp c94180a0-eb00-432a-bcb2-bf07234aaaf2))
-  (fp_line (start 4.625 -0.5) (end 4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp ccac5873-2d6f-4481-903a-ce6e77a59252))
-  (fp_line (start 4.125 0) (end 4.625 0) (layer "F.Fab") (width 0.1) (tstamp d5e9f56e-30b9-44c7-84f3-f7a94a950f7a))
-  (fp_line (start -4.375 1.042893) (end -3.875 1.75) (layer "F.Fab") (width 0.1) (tstamp d75d809d-e758-460e-ab52-3afa55d257fd))
-  (fp_line (start 1.625 -0.5) (end 1.625 0) (layer "F.Fab") (width 0.1) (tstamp e0759ddf-a4d6-4e3b-a1d9-86bef00d569f))
-  (fp_line (start -0.875 -0.5) (end -0.875 0) (layer "F.Fab") (width 0.1) (tstamp e21c8c34-774c-46e4-88d7-6b77565a06f8))
-  (fp_line (start -6.625 -2.5) (end 6.625 -2.5) (layer "F.Fab") (width 0.1) (tstamp f7b27eb6-363d-42cf-aa9b-a8aedeaa7148))
-  (fp_line (start -3.375 0) (end -2.875 0) (layer "F.Fab") (width 0.1) (tstamp f7c72811-4d15-4e2d-bc08-6ae4d2099ac5))
-  (fp_line (start 6.625 1.75) (end 6.625 -2.5) (layer "F.Fab") (width 0.1) (tstamp f988abae-0363-4f90-aeb7-abe9dda5d86f))
-  (fp_line (start -2.125 -0.5) (end -2.125 0) (layer "F.Fab") (width 0.1) (tstamp fa1f99fa-7549-4cc3-878e-6a94bd3a9704))
-  (pad "1" smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5a973e71-b735-4940-b8a1-d729e63b0a23))
-  (pad "2" smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e6ace73-6453-46f8-afcc-a3d3a4698273))
-  (pad "3" smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dfff0dc0-447a-489f-812e-4115cd95e690))
-  (pad "4" smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eb29cf02-108b-4e06-b3a1-6b92312eeb4b))
-  (pad "5" smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 86f0097e-f53a-4ac7-a1fb-d4bf566abd8e))
-  (pad "6" smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0c4c08ce-19d0-419b-9488-f9fa3ea8fc4d))
-  (pad "7" smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d281e06d-e4fd-472b-8d8e-14520b99b545))
-  (pad "8" smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d2cbea34-811b-4535-bee1-e91990fb4904))
-  (pad "MP" smd roundrect (at -6.225 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e79dc74-2983-4991-87ed-0e13168cdfce))
-  (pad "MP" smd roundrect (at 6.225 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ef074856-fbb3-4d55-8ffa-2aee05608909))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM08B-GHS-TBT_1x08-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical.kicad_mod
index f2abea399..e17c98bf1 100644
--- a/Connector_JST.pretty/JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,85 +1,133 @@
-(footprint "JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM09B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cf319e01-1a12-4db5-82e0-efd8a3ee42f5)
   )
-  (fp_text value "JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b605a92e-a99b-4156-898f-a84609ee357d)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -7.25 1.75) (end 7.25 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.36 0.26) (end -7.36 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.36 1.86) (end -5.56 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.56 1.86) (end -5.56 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.36 0.26) (end 7.36 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.36 1.86) (end 5.56 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.09 -2.61) (end 6.09 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.25 -2.5) (end 7.25 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 1.75) (end -7.25 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 1.75) (end 7.25 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -0.5) (end -5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 0) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 0) (end -2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -0.5) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.5) (end -1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 0) (end 1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 -0.5) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -0.5) (end 2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 0) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 0) (end 5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -0.5) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.85 -3.3) (end -7.85 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.85 3.3) (end 7.85 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.85 3.3) (end 7.85 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.85 -3.3) (end -7.85 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 1.75) (end -5 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 1.042893) (end -4.5 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.85 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 6.85 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp da443e85-0c01-4f01-b0a0-ff3f1ce18d63)
   )
-  (fp_line (start 7.36 0.26) (end 7.36 1.86) (layer "F.SilkS") (width 0.12) (tstamp 02d3ec0d-a0ab-484f-8d82-595d89de0753))
-  (fp_line (start -7.36 1.86) (end -5.56 1.86) (layer "F.SilkS") (width 0.12) (tstamp 33d6bb6f-e55e-4d7b-aa15-066f5fb8bcc3))
-  (fp_line (start -7.36 0.26) (end -7.36 1.86) (layer "F.SilkS") (width 0.12) (tstamp 772df95d-4a2a-4c7e-baa0-bbf60a1382bb))
-  (fp_line (start -6.09 -2.61) (end 6.09 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 86c94498-6890-42c5-b927-75471f4b11b0))
-  (fp_line (start -5.56 1.86) (end -5.56 2.8) (layer "F.SilkS") (width 0.12) (tstamp b383e4eb-5ed7-475b-987b-67e66ad9f544))
-  (fp_line (start 7.36 1.86) (end 5.56 1.86) (layer "F.SilkS") (width 0.12) (tstamp d1706b6e-02f6-410a-b1e8-f16230c89084))
-  (fp_line (start 7.85 -3.3) (end -7.85 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 765c07eb-1a1e-43ee-b048-16485d6031ce))
-  (fp_line (start 7.85 3.3) (end 7.85 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 93c8c1e5-57bf-4ad2-9e24-65ad7347f946))
-  (fp_line (start -7.85 3.3) (end 7.85 3.3) (layer "F.CrtYd") (width 0.05) (tstamp c0eba772-4c01-4beb-afc2-2ec04004cbc4))
-  (fp_line (start -7.85 -3.3) (end -7.85 3.3) (layer "F.CrtYd") (width 0.05) (tstamp ded45647-6fb7-4e17-bf3c-0e8e71b69c70))
-  (fp_line (start 2.25 -0.5) (end 2.25 0) (layer "F.Fab") (width 0.1) (tstamp 0125d4ce-c918-4c67-9165-7d5f7af46bfa))
-  (fp_line (start 1.5 0) (end 1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 047b436d-6e2f-413e-8db2-a543ff83fe83))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp 047d2215-ae71-4a47-8d04-7b736f854dd1))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1352b20e-052f-420f-9de1-5d4c4d08c878))
-  (fp_line (start 2.75 0) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1f6ebfa8-82a2-4864-93ea-9c5e7f08b834))
-  (fp_line (start -4.75 0) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 21e216ee-788c-427c-95f8-494923bfa030))
-  (fp_line (start 5.25 -0.5) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 273d6d5d-a2ab-48d4-86f7-b5ab76af0f4c))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp 2a2f33c5-768b-4ff1-8d6e-dbff4790b636))
-  (fp_line (start -5.25 0) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp 3866ce17-ef99-4530-b5c6-a11102198ce7))
-  (fp_line (start -1.5 -0.5) (end -1.5 0) (layer "F.Fab") (width 0.1) (tstamp 38eb23df-9f95-4d45-a9e4-8235e06a3cb7))
-  (fp_line (start -5.5 1.75) (end -5 1.042893) (layer "F.Fab") (width 0.1) (tstamp 404eef1c-8ee3-4036-bdf9-0e1b3593a495))
-  (fp_line (start -7.25 1.75) (end -7.25 -2.5) (layer "F.Fab") (width 0.1) (tstamp 43792607-d564-421e-ad7d-0172d11ef2b4))
-  (fp_line (start -5 1.042893) (end -4.5 1.75) (layer "F.Fab") (width 0.1) (tstamp 48f60e06-c114-49af-89dc-813808c72ed9))
-  (fp_line (start 1 -0.5) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 5aebcd92-e250-44e4-bccc-bba79b61d1b8))
-  (fp_line (start -2.75 -0.5) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp 614792b5-76d3-4423-baaa-b49719990ac8))
-  (fp_line (start -2.25 0) (end -2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6c65d954-d006-4199-a6c7-2d40ad814959))
-  (fp_line (start 5.25 0) (end 5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6e0ed587-2d54-4b0c-990a-a1c00f71a7d0))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 7b482275-1c94-4c15-9870-50ee06e482af))
-  (fp_line (start 2.75 -0.5) (end 2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7f634c06-bcf9-48cf-9296-ac1df88ddc52))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 80267ea9-82e2-4312-b948-d7593e320a0d))
-  (fp_line (start -5.25 -0.5) (end -5.25 0) (layer "F.Fab") (width 0.1) (tstamp 8b4b5c0d-5a49-48c6-96f1-acd6b42893d9))
-  (fp_line (start 2.25 0) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 950f2431-6d0e-4f75-9f24-e4cf6e73252f))
-  (fp_line (start 1 0) (end 1.5 0) (layer "F.Fab") (width 0.1) (tstamp 9b388b4e-1d64-480a-90bc-92522fe9c036))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp a05abded-3e95-4e04-9a8a-7905fc2a650e))
-  (fp_line (start 7.25 1.75) (end 7.25 -2.5) (layer "F.Fab") (width 0.1) (tstamp a31759ce-ebc3-47c3-bdf9-39f16b618489))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp a5593c5a-5495-4efe-b097-3c64b8836d47))
-  (fp_line (start -1.5 0) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp b659c4fc-cbce-42c4-b0fa-a40ccf782100))
-  (fp_line (start -4.75 -0.5) (end -5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp c1a84a4f-1a28-4479-92fb-8a8a1075b924))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp c2fe301b-6770-4e37-8293-428981b98d05))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp c90beaaa-2ba7-41d1-a99f-899f3cefd185))
-  (fp_line (start -1 -0.5) (end -1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp cc058f54-4473-4a61-9a70-1653c77e70ac))
-  (fp_line (start 4.75 -0.5) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp cc974a94-8cd2-4669-bb4e-681253abf04b))
-  (fp_line (start -1 0) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp d868a3a9-4a76-4f0a-8468-b7f4d5723a42))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e095e0dc-ada6-4065-a710-7c864fd73d63))
-  (fp_line (start 1.5 -0.5) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp e39836e6-7b78-4e12-9bb6-a80fa14f5d0f))
-  (fp_line (start -2.25 -0.5) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp e6ccdcb0-8f07-4c3a-a67d-326d6f6a1c91))
-  (fp_line (start 4.75 0) (end 5.25 0) (layer "F.Fab") (width 0.1) (tstamp eb96b864-f7e7-4954-b665-ee2e387b31af))
-  (fp_line (start -2.75 0) (end -2.25 0) (layer "F.Fab") (width 0.1) (tstamp ee6fc63b-ad9b-4c2d-96ec-abdf1cb8c57e))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp f242abac-3392-484d-a415-518b619684d8))
-  (fp_line (start -7.25 -2.5) (end 7.25 -2.5) (layer "F.Fab") (width 0.1) (tstamp f52797b4-6cc2-4cbc-bd45-bb89944a5ac1))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp f6e050b1-2bc0-40ad-b6d4-29b8ae5f1c7c))
-  (fp_line (start -7.25 1.75) (end 7.25 1.75) (layer "F.Fab") (width 0.1) (tstamp facc8e76-ab37-41d0-9755-e8f27479c2db))
-  (pad "1" smd roundrect (at -5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aaffc6fb-44e3-4ba8-80d8-4f69593aff03))
-  (pad "2" smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7fd11f00-8f9b-46be-ac22-784d3dad4dd7))
-  (pad "3" smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8dc1b946-202c-4096-b616-4b901c0630e4))
-  (pad "4" smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f83fac49-3fb1-4338-9584-596e247c4413))
-  (pad "5" smd roundrect (at 0 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 69da2ba7-2918-4d53-ae44-1110da577ee2))
-  (pad "6" smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 91bc0d33-4acb-4a44-8329-c67e953af18a))
-  (pad "7" smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 83390c84-9eb4-403a-a7a8-02909997ef49))
-  (pad "8" smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d6e7c8b1-534b-4ca3-97c1-beb235bc24e2))
-  (pad "9" smd roundrect (at 5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4737c1b8-eba7-4a0b-bd44-539399bf50a1))
-  (pad "MP" smd roundrect (at -6.85 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 21643ed3-67a7-4847-b97e-087a9698ba86))
-  (pad "MP" smd roundrect (at 6.85 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 32277d58-8656-4528-b28c-850636054744))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM09B-GHS-TBT_1x09-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical.kicad_mod
index e3e525be5..9a5d5f59b 100644
--- a/Connector_JST.pretty/JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,90 +1,142 @@
-(footprint "JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM10B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0abfcbe9-530b-46fb-97b5-d4079623243f)
   )
-  (fp_text value "JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 288b0e73-b3b6-4aac-8efb-3a30da700446)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -7.875 1.75) (end 7.875 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.985 0.26) (end -7.985 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.985 1.86) (end -6.185 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.185 1.86) (end -6.185 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.985 0.26) (end 7.985 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.985 1.86) (end 6.185 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.715 -2.61) (end 6.715 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.875 -2.5) (end 7.875 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.875 1.75) (end -7.875 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.875 1.75) (end 7.875 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.875 -0.5) (end -5.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.875 0) (end -5.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 0) (end -5.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 -0.5) (end -5.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 -0.5) (end -4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 0) (end -4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 0) (end -4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 -0.5) (end -4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 -0.5) (end -3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 0) (end -2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 0) (end -2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 -0.5) (end -3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 -0.5) (end -2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 0) (end -1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 0) (end -1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 -0.5) (end -2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 -0.5) (end -0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 0) (end -0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 0) (end -0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 -0.5) (end -0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 -0.5) (end 0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 0) (end 0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 0) (end 0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 -0.5) (end 0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 -0.5) (end 1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 0) (end 2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 0) (end 2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 -0.5) (end 1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 -0.5) (end 2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 0) (end 3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 0) (end 3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 -0.5) (end 2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 -0.5) (end 4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 0) (end 4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 0) (end 4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 -0.5) (end 4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 -0.5) (end 5.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 0) (end 5.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.875 0) (end 5.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.875 -0.5) (end 5.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.48 -3.3) (end -8.48 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.48 3.3) (end 8.48 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.48 3.3) (end 8.48 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.48 -3.3) (end -8.48 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.125 1.75) (end -5.625 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.625 1.042893) (end -5.125 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.475 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 7.475 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c81fe401-a416-4fd8-a2b5-062f3fda5cff)
   )
-  (fp_line (start 7.985 0.26) (end 7.985 1.86) (layer "F.SilkS") (width 0.12) (tstamp 26f47692-c70b-4167-a7bf-b25b21638743))
-  (fp_line (start -6.715 -2.61) (end 6.715 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 29fab182-be4c-4b08-a291-55d777ea3642))
-  (fp_line (start -7.985 0.26) (end -7.985 1.86) (layer "F.SilkS") (width 0.12) (tstamp 59e4ebe3-2e95-4bd2-b2c4-617fe6d35795))
-  (fp_line (start -7.985 1.86) (end -6.185 1.86) (layer "F.SilkS") (width 0.12) (tstamp 73a0e935-dd19-4cdc-9f5f-7744f45eff1c))
-  (fp_line (start -6.185 1.86) (end -6.185 2.8) (layer "F.SilkS") (width 0.12) (tstamp c83c23d8-192d-44c7-be34-38f04215a11c))
-  (fp_line (start 7.985 1.86) (end 6.185 1.86) (layer "F.SilkS") (width 0.12) (tstamp f4d5c951-dac4-4cc3-ad08-fbef73370aea))
-  (fp_line (start -8.48 3.3) (end 8.48 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 1477f564-7d5d-4477-a6d9-a9479eaa30c7))
-  (fp_line (start 8.48 3.3) (end 8.48 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp a54c359e-af8d-403b-98c0-a25dc944c0d6))
-  (fp_line (start -8.48 -3.3) (end -8.48 3.3) (layer "F.CrtYd") (width 0.05) (tstamp a7de1d85-0eea-43b8-a963-7ad4c361067e))
-  (fp_line (start 8.48 -3.3) (end -8.48 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp eb39d6e0-dabd-4607-991f-e0485fc024c5))
-  (fp_line (start -2.125 0) (end -1.625 0) (layer "F.Fab") (width 0.1) (tstamp 03798386-0758-4a0a-82a1-d09306ea25d3))
-  (fp_line (start -5.375 -0.5) (end -5.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 03f6792c-4149-464c-ae67-118747226a28))
-  (fp_line (start 0.875 0) (end 0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 05fb4d3c-0747-4188-986b-e624bdef93a2))
-  (fp_line (start -1.625 -0.5) (end -2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 09c92f55-1fba-45cc-9dd3-15339320f930))
-  (fp_line (start -6.125 1.75) (end -5.625 1.042893) (layer "F.Fab") (width 0.1) (tstamp 0d3d4697-dbdb-4ba8-b77f-6b8bd86aba94))
-  (fp_line (start 5.875 0) (end 5.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 114f6198-63e0-4121-aadb-e30bcdfa3ec5))
-  (fp_line (start -2.875 0) (end -2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 11c1b7f7-1381-4d2f-b080-307a0d6e825e))
-  (fp_line (start -0.875 0) (end -0.375 0) (layer "F.Fab") (width 0.1) (tstamp 15f95171-4c49-4e6d-90f7-26ca613632ca))
-  (fp_line (start 3.375 0) (end 3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 17e3bae3-b5d6-4309-b162-794b7fee17ec))
-  (fp_line (start 7.875 1.75) (end 7.875 -2.5) (layer "F.Fab") (width 0.1) (tstamp 1815b033-0007-411d-942c-41fd6c4ec2d7))
-  (fp_line (start 2.125 -0.5) (end 1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1ec2a83d-6236-4da4-a5e9-4d07cdc226d6))
-  (fp_line (start -7.875 1.75) (end -7.875 -2.5) (layer "F.Fab") (width 0.1) (tstamp 259204b6-60f8-482c-bb2d-aedc02b2b6ff))
-  (fp_line (start 5.375 -0.5) (end 5.375 0) (layer "F.Fab") (width 0.1) (tstamp 26be7ba6-c762-4a42-8fb8-02f00e51a2d6))
-  (fp_line (start -4.625 0) (end -4.125 0) (layer "F.Fab") (width 0.1) (tstamp 2ee06837-aff0-4f7f-a234-c6fa57e39619))
-  (fp_line (start 5.375 0) (end 5.875 0) (layer "F.Fab") (width 0.1) (tstamp 307d78d6-e605-4f50-82a9-91f328942bd2))
-  (fp_line (start -7.875 -2.5) (end 7.875 -2.5) (layer "F.Fab") (width 0.1) (tstamp 349773b9-2d7e-425b-9b6c-0c83ccfaf589))
-  (fp_line (start -0.875 -0.5) (end -0.875 0) (layer "F.Fab") (width 0.1) (tstamp 349d56be-fa9d-4a31-9b16-2f748e1d0a8a))
-  (fp_line (start -4.125 0) (end -4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4765e0b5-e73e-461f-91bc-0abc7620b6ee))
-  (fp_line (start 3.375 -0.5) (end 2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 496b37f0-f50b-4b07-94e7-df700d5cbbe4))
-  (fp_line (start -7.875 1.75) (end 7.875 1.75) (layer "F.Fab") (width 0.1) (tstamp 4c2b0897-45d9-43d2-a7d0-09a22eae3fc0))
-  (fp_line (start 5.875 -0.5) (end 5.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5448f879-cec8-41c7-9772-e32f69ffcaf1))
-  (fp_line (start -2.875 -0.5) (end -3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 54b38f3a-39c9-4e86-a977-d57cc3c1af87))
-  (fp_line (start -3.375 -0.5) (end -3.375 0) (layer "F.Fab") (width 0.1) (tstamp 5b8f520d-7bbf-414b-afd5-7141652b83bd))
-  (fp_line (start 1.625 -0.5) (end 1.625 0) (layer "F.Fab") (width 0.1) (tstamp 72170d0c-8d5f-4200-a5f8-70c3554b6a82))
-  (fp_line (start 0.875 -0.5) (end 0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 74aacc27-72c5-4f9b-b14b-eece101dc000))
-  (fp_line (start 0.375 0) (end 0.875 0) (layer "F.Fab") (width 0.1) (tstamp 7a8cc152-9234-49d8-b93d-071298e6a6b9))
-  (fp_line (start 4.125 0) (end 4.625 0) (layer "F.Fab") (width 0.1) (tstamp 7dcbc3bc-7487-4ef5-b929-436afed672d0))
-  (fp_line (start 1.625 0) (end 2.125 0) (layer "F.Fab") (width 0.1) (tstamp 89b22c82-c82f-4d1b-8ffd-9026ffdc2b28))
-  (fp_line (start -4.125 -0.5) (end -4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8c1845fb-39d4-4f3e-9d86-c4da59b3b96b))
-  (fp_line (start -0.375 -0.5) (end -0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 93f80488-7132-4cf5-bb70-15b544548a03))
-  (fp_line (start -5.375 0) (end -5.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp a1d9a296-da4e-4353-95a6-a63ae8ae6462))
-  (fp_line (start 2.125 0) (end 2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp a52b4e90-5a38-472f-b449-57681b3176ea))
-  (fp_line (start 4.125 -0.5) (end 4.125 0) (layer "F.Fab") (width 0.1) (tstamp af65acb4-59b8-48ca-907d-dca192408efa))
-  (fp_line (start 2.875 0) (end 3.375 0) (layer "F.Fab") (width 0.1) (tstamp b355ee31-2bb5-4a0f-bec1-3fa014498d4f))
-  (fp_line (start 4.625 0) (end 4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp b6326f60-ad79-4510-bd7a-0b95167be0b4))
-  (fp_line (start 0.375 -0.5) (end 0.375 0) (layer "F.Fab") (width 0.1) (tstamp be824bea-aa8d-4520-9752-0bae16c46bc9))
-  (fp_line (start -0.375 0) (end -0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp c956cafd-4d59-401d-9e7e-882790afc497))
-  (fp_line (start 4.625 -0.5) (end 4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp c981dd5c-2424-43b5-b924-beeb2782efb2))
-  (fp_line (start -3.375 0) (end -2.875 0) (layer "F.Fab") (width 0.1) (tstamp ca5b76f7-48e8-4c16-b45d-fdad92b10239))
-  (fp_line (start -4.625 -0.5) (end -4.625 0) (layer "F.Fab") (width 0.1) (tstamp caaf266c-d6a5-40ed-82a9-447a5f41e711))
-  (fp_line (start -5.875 -0.5) (end -5.875 0) (layer "F.Fab") (width 0.1) (tstamp d828feb5-22bb-48a7-8aee-01e82809662d))
-  (fp_line (start 2.875 -0.5) (end 2.875 0) (layer "F.Fab") (width 0.1) (tstamp eb2c714b-56b1-489c-89c4-b1c1aef8bfb4))
-  (fp_line (start -5.625 1.042893) (end -5.125 1.75) (layer "F.Fab") (width 0.1) (tstamp ec3a1a03-eff4-4363-baa7-8280a58c8cd4))
-  (fp_line (start -5.875 0) (end -5.375 0) (layer "F.Fab") (width 0.1) (tstamp f039da9e-7f8f-4ad3-ae91-5a3fc54024fa))
-  (fp_line (start -1.625 0) (end -1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp feb3a957-a0c0-4932-8ae0-fb22daf65aed))
-  (fp_line (start -2.125 -0.5) (end -2.125 0) (layer "F.Fab") (width 0.1) (tstamp ff3f2b52-9e50-4fe5-bad6-e597d40d22d4))
-  (pad "1" smd roundrect (at -5.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97608951-4b51-46ce-8741-aa01949bc2be))
-  (pad "2" smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb72ed22-0914-40d8-ab4e-ea7e46db256f))
-  (pad "3" smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 98e55954-5b2c-446b-b204-f726b381ad3c))
-  (pad "4" smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 395deb7d-b077-47e3-b3ef-95a48c74a362))
-  (pad "5" smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 95da0079-e3a9-47cb-8969-b3946312834f))
-  (pad "6" smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c36719dd-205d-43a5-8cb0-81a67338658c))
-  (pad "7" smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fe6c2356-ec64-49cb-9e65-495f9781adb7))
-  (pad "8" smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 592462d7-d065-4beb-9190-26cfff191bb4))
-  (pad "9" smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 50f6e088-49c6-4754-b8f6-d0659b743708))
-  (pad "10" smd roundrect (at 5.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 03bbd4a3-742c-443b-965e-5b795cd87b73))
-  (pad "MP" smd roundrect (at -7.475 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc9116d6-65d6-4855-b692-88e1043764f0))
-  (pad "MP" smd roundrect (at 7.475 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f3ae167a-a340-453c-967d-272d80c9b058))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM10B-GHS-TBT_1x10-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical.kicad_mod
index 37813b6fc..9ac2d8e9a 100644
--- a/Connector_JST.pretty/JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,95 +1,151 @@
-(footprint "JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM11B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 93fc8d06-107c-4d47-b48d-7ca7ea904caf)
   )
-  (fp_text value "JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 246b3262-28d2-4d48-96e1-140ec4997311)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -8.5 1.75) (end 8.5 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.61 0.26) (end -8.61 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.61 1.86) (end -6.81 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.81 1.86) (end -6.81 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 0.26) (end 8.61 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 1.86) (end 6.81 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.34 -2.61) (end 7.34 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.5 -2.5) (end 8.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 1.75) (end -8.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 1.75) (end 8.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.5) (end -6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0) (end -6 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 0) (end -6 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -0.5) (end -6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -0.5) (end -5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 0) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 0) (end -2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -0.5) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.5) (end -1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 0) (end 1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 -0.5) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -0.5) (end 2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 0) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 0) (end 5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -0.5) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 -0.5) (end 6 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 0) (end 6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 0) (end 6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -0.5) (end 6 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.1 -3.3) (end -9.1 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.1 3.3) (end 9.1 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.1 3.3) (end 9.1 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.1 -3.3) (end -9.1 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.75 1.75) (end -6.25 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 1.042893) (end -5.75 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.1 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 8.1 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4419eee0-3116-491b-85e4-3df93147da6d)
   )
-  (fp_line (start -6.81 1.86) (end -6.81 2.8) (layer "F.SilkS") (width 0.12) (tstamp 0dc0feb7-c2ce-4423-9f22-9f5c6c8bcdbb))
-  (fp_line (start -8.61 1.86) (end -6.81 1.86) (layer "F.SilkS") (width 0.12) (tstamp 3102d729-3d1f-4eed-bee6-f6f67f7cac60))
-  (fp_line (start 8.61 1.86) (end 6.81 1.86) (layer "F.SilkS") (width 0.12) (tstamp 5e998ca6-4849-4465-9736-ce39f836b017))
-  (fp_line (start -7.34 -2.61) (end 7.34 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 5ed58534-9df1-48ff-8e62-eb35f5bfe65b))
-  (fp_line (start -8.61 0.26) (end -8.61 1.86) (layer "F.SilkS") (width 0.12) (tstamp 735f7b7c-bd5f-4a10-98e7-decd70f75a57))
-  (fp_line (start 8.61 0.26) (end 8.61 1.86) (layer "F.SilkS") (width 0.12) (tstamp f2799e13-4097-4433-a59b-4849c77d610d))
-  (fp_line (start 9.1 3.3) (end 9.1 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp a9e59788-8afd-4301-b561-571fef2b5909))
-  (fp_line (start -9.1 -3.3) (end -9.1 3.3) (layer "F.CrtYd") (width 0.05) (tstamp af57a5f5-8a01-4302-82ed-0b95105b797d))
-  (fp_line (start 9.1 -3.3) (end -9.1 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp f77c8290-a2b6-4d90-9e0c-35c2508654ef))
-  (fp_line (start -9.1 3.3) (end 9.1 3.3) (layer "F.CrtYd") (width 0.05) (tstamp f818734c-d348-42eb-a9c6-d54adf111ed5))
-  (fp_line (start 2.25 0) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 0117c6c3-47ae-420f-b96d-27947f24e2a8))
-  (fp_line (start 8.5 1.75) (end 8.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp 05ffa94c-056d-4e3d-9723-0736bc0f3d2e))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 09784b7b-751f-4b29-a746-af1514270b99))
-  (fp_line (start -6.5 0) (end -6 0) (layer "F.Fab") (width 0.1) (tstamp 0c369081-56cd-43f0-a627-0d561c4da9a5))
-  (fp_line (start 2.25 -0.5) (end 2.25 0) (layer "F.Fab") (width 0.1) (tstamp 0e49b13f-2969-4e07-afbd-7bf069cd5738))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 1e4be15d-1842-45a9-b4a6-1906bf5cdba4))
-  (fp_line (start -6 0) (end -6 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1fe2c09b-6839-4161-93b2-54c4b7b3f3c3))
-  (fp_line (start 5.25 -0.5) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 234f9d33-d505-497c-9d25-8e81b9750c63))
-  (fp_line (start 4.75 -0.5) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp 23a1ab75-9fbe-46ef-a44a-fb3218f29ea1))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp 25ec3bc2-30a6-4b6c-a76e-f9d8e536c570))
-  (fp_line (start -1 -0.5) (end -1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2ce54b35-ca29-4623-b812-e0ea2b4a0c91))
-  (fp_line (start 1 -0.5) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 30e6af09-ff20-401f-8cc3-f45e96f2d8b0))
-  (fp_line (start 6 -0.5) (end 6 0) (layer "F.Fab") (width 0.1) (tstamp 38650913-ea0f-4ae5-a93b-90608be7f84e))
-  (fp_line (start 5.25 0) (end 5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 39f3ba75-a446-4ea0-889d-6c62e8b22ca4))
-  (fp_line (start -2.75 0) (end -2.25 0) (layer "F.Fab") (width 0.1) (tstamp 3de9e4fc-9ac4-4aa1-9504-d6577705a21b))
-  (fp_line (start 6 0) (end 6.5 0) (layer "F.Fab") (width 0.1) (tstamp 3f69fdd3-f208-42ce-917a-7f399f11d7fc))
-  (fp_line (start 2.75 -0.5) (end 2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 439a0aa8-b018-4a96-94b9-4e5f307aea42))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4586c8ac-0a95-400f-803a-a2434887ab4d))
-  (fp_line (start -6.75 1.75) (end -6.25 1.042893) (layer "F.Fab") (width 0.1) (tstamp 47e01436-111b-4408-9055-e3ec8109d411))
-  (fp_line (start -8.5 1.75) (end -8.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp 4b464336-e561-4922-879e-b37964734931))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4b647204-907b-4660-85d3-abdb477a1229))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp 52271fdd-2495-4c89-8023-4a8eda49059c))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5532f0aa-b852-44f5-8269-e8f6a5926448))
-  (fp_line (start -5.25 -0.5) (end -5.25 0) (layer "F.Fab") (width 0.1) (tstamp 60e7a57a-4415-4397-b844-5621ddb86590))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 65a46e82-eefc-4051-a7b8-82ab9e403caf))
-  (fp_line (start 1.5 -0.5) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6a5152c7-efca-4640-8041-3ed338a6b85a))
-  (fp_line (start -2.25 -0.5) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7378f601-4389-4a62-b691-47afdce557db))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 768f7def-2bbd-46be-b3c8-1028c2b4dba7))
-  (fp_line (start -6.5 -0.5) (end -6.5 0) (layer "F.Fab") (width 0.1) (tstamp 80c3cc1b-92be-4dd3-8c73-ee19b67f7f15))
-  (fp_line (start 2.75 0) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 92da6481-1e09-483e-8eb0-f10fb7175a74))
-  (fp_line (start -2.25 0) (end -2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 964c441e-7207-497c-938d-ba12e3b60ed5))
-  (fp_line (start -5.25 0) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp 99d42d86-7a25-4757-b4f0-8c4e37584d25))
-  (fp_line (start 4.75 0) (end 5.25 0) (layer "F.Fab") (width 0.1) (tstamp a0a1a189-cfb3-454f-9a36-c78e533a657c))
-  (fp_line (start -6.25 1.042893) (end -5.75 1.75) (layer "F.Fab") (width 0.1) (tstamp a96a5907-1c06-4fa4-a605-4a99f5f07714))
-  (fp_line (start -6 -0.5) (end -6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp ac93e23b-3fe6-4244-850a-ff6324a96772))
-  (fp_line (start -4.75 -0.5) (end -5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp adc040c5-e719-43f8-a3be-4ee0e8da6cec))
-  (fp_line (start 1 0) (end 1.5 0) (layer "F.Fab") (width 0.1) (tstamp b0299a0a-3ceb-4b33-b83f-638b357a5ede))
-  (fp_line (start 6.5 -0.5) (end 6 -0.5) (layer "F.Fab") (width 0.1) (tstamp b1079f22-cb99-4984-a9d2-a0f08803273b))
-  (fp_line (start -2.75 -0.5) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp b4c3da9e-283c-4e3e-ae96-9d4e9333563d))
-  (fp_line (start -4.75 0) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp bbc62d03-6875-465a-9ec0-3f520a455242))
-  (fp_line (start -8.5 1.75) (end 8.5 1.75) (layer "F.Fab") (width 0.1) (tstamp c1ddd147-8586-4a2a-9b7f-f46bca7ded8f))
-  (fp_line (start 1.5 0) (end 1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp ce12e066-d30f-42a5-ab89-23e8bd5ef45d))
-  (fp_line (start -1.5 -0.5) (end -1.5 0) (layer "F.Fab") (width 0.1) (tstamp ce36bcaf-997b-48b5-b13c-45312d6599a8))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp d833d281-38b1-4139-b03b-e6eb9f146ecd))
-  (fp_line (start -1.5 0) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp ddd0c98a-fc4e-488f-9da5-cbf661dda7d7))
-  (fp_line (start -1 0) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp e68d7897-ab9f-4398-b3c9-c9d6ba5faeef))
-  (fp_line (start -8.5 -2.5) (end 8.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp e7a0076d-62b6-49af-a7d3-dbaf0485d96f))
-  (fp_line (start 6.5 0) (end 6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp eb6309ac-1a3f-48eb-a2fb-29e57194debe))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp f0b81302-65ea-4a10-a104-990d31696b40))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp fb6f7119-4680-46ba-a9ba-c89f2801056a))
-  (pad "1" smd roundrect (at -6.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 27ec81b3-415c-464f-971c-d0769cce514f))
-  (pad "2" smd roundrect (at -5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1c31ed1e-f2c5-4926-915f-535cb370faa4))
-  (pad "3" smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cf8d1c84-ee35-493e-906b-ee37105e0ec9))
-  (pad "4" smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp de1c45d7-6a80-4d9c-82db-9d1c7dd31973))
-  (pad "5" smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f919f14e-01fb-4994-99d5-096f348d4af4))
-  (pad "6" smd roundrect (at 0 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a0081edf-6f3a-472a-8397-e81b4cd01490))
-  (pad "7" smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 376a1894-35e9-410d-81bf-bb15894908a9))
-  (pad "8" smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d410f88e-e349-4803-a957-6d6198a93083))
-  (pad "9" smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a580c83e-e7c7-45ae-84b5-7fc8805bb0a0))
-  (pad "10" smd roundrect (at 5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 429243cc-24a7-496a-9030-8d62904281aa))
-  (pad "11" smd roundrect (at 6.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7af8dc4e-0697-4981-956e-86b1dcb49a13))
-  (pad "MP" smd roundrect (at -8.1 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 574fa4f1-576d-4bfb-87be-504b67d19538))
-  (pad "MP" smd roundrect (at 8.1 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c3290fc5-fa75-449a-aa03-f7b232ebb2b6))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM11B-GHS-TBT_1x11-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical.kicad_mod
index 727fb1e0d..c61131828 100644
--- a/Connector_JST.pretty/JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,100 +1,160 @@
-(footprint "JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM12B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6b2aa28e-353a-428c-b72c-679c2f4e531d)
   )
-  (fp_text value "JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6796b023-4c4c-4150-bd6c-ca44fe836ec4)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -9.125 1.75) (end 9.125 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.235 0.26) (end -9.235 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.235 1.86) (end -7.435 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.435 1.86) (end -7.435 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.235 0.26) (end 9.235 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.235 1.86) (end 7.435 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.965 -2.61) (end 7.965 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.125 -2.5) (end 9.125 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.125 1.75) (end -9.125 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.125 1.75) (end 9.125 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.125 -0.5) (end -7.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.125 0) (end -6.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.625 0) (end -6.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.625 -0.5) (end -7.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.875 -0.5) (end -5.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.875 0) (end -5.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 0) (end -5.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 -0.5) (end -5.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 -0.5) (end -4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 0) (end -4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 0) (end -4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 -0.5) (end -4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 -0.5) (end -3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 0) (end -2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 0) (end -2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 -0.5) (end -3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 -0.5) (end -2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 0) (end -1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 0) (end -1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 -0.5) (end -2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 -0.5) (end -0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 0) (end -0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 0) (end -0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 -0.5) (end -0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 -0.5) (end 0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 0) (end 0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 0) (end 0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 -0.5) (end 0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 -0.5) (end 1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 0) (end 2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 0) (end 2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 -0.5) (end 1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 -0.5) (end 2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 0) (end 3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 0) (end 3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 -0.5) (end 2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 -0.5) (end 4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 0) (end 4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 0) (end 4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 -0.5) (end 4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 -0.5) (end 5.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 0) (end 5.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.875 0) (end 5.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.875 -0.5) (end 5.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.625 -0.5) (end 6.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.625 0) (end 7.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.125 0) (end 7.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.125 -0.5) (end 6.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.72 -3.3) (end -9.72 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.72 3.3) (end 9.72 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.72 3.3) (end 9.72 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.72 -3.3) (end -9.72 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.375 1.75) (end -6.875 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.875 1.042893) (end -6.375 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.725 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 8.725 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b774f293-040e-41d6-bb1c-1a902d776e50)
   )
-  (fp_line (start -7.965 -2.61) (end 7.965 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 098aa50f-761c-4e02-9c38-e16e5c08653e))
-  (fp_line (start 9.235 0.26) (end 9.235 1.86) (layer "F.SilkS") (width 0.12) (tstamp 5766a904-3027-4116-a1c3-780da65256d3))
-  (fp_line (start -9.235 0.26) (end -9.235 1.86) (layer "F.SilkS") (width 0.12) (tstamp 76b64add-231d-4aae-8a9e-fd1aa36b3815))
-  (fp_line (start -9.235 1.86) (end -7.435 1.86) (layer "F.SilkS") (width 0.12) (tstamp 86672ab0-f3a2-4ee0-bd3a-fc1084ea7db9))
-  (fp_line (start -7.435 1.86) (end -7.435 2.8) (layer "F.SilkS") (width 0.12) (tstamp c7974bf7-c392-4e42-8fc1-67280dea5c5d))
-  (fp_line (start 9.235 1.86) (end 7.435 1.86) (layer "F.SilkS") (width 0.12) (tstamp f3ab7593-c339-46d3-bb64-b52e78c025bd))
-  (fp_line (start 9.72 -3.3) (end -9.72 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 08e9b4c4-4a66-4899-8108-6e1f711319f6))
-  (fp_line (start -9.72 3.3) (end 9.72 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 1cdd450a-22d9-451b-beb1-50697d752184))
-  (fp_line (start -9.72 -3.3) (end -9.72 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 22c14385-1338-4707-9760-286de9e49b53))
-  (fp_line (start 9.72 3.3) (end 9.72 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp c535ceb5-c5f3-4d7f-9d15-6206ceb6e1b8))
-  (fp_line (start -2.125 0) (end -1.625 0) (layer "F.Fab") (width 0.1) (tstamp 01b7b8e9-3b60-438d-8a9b-c7efd966b18e))
-  (fp_line (start -4.125 0) (end -4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 03d05a9e-2ff9-49e3-b11e-1a567e24c9b1))
-  (fp_line (start 3.375 0) (end 3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0d770ede-9902-423f-aa04-8d39e757affa))
-  (fp_line (start -5.875 -0.5) (end -5.875 0) (layer "F.Fab") (width 0.1) (tstamp 12d14284-2def-4a86-9b91-75c53aedfabe))
-  (fp_line (start 0.875 -0.5) (end 0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 15f9b8c2-fe59-45ab-94b8-224feead135a))
-  (fp_line (start -9.125 1.75) (end -9.125 -2.5) (layer "F.Fab") (width 0.1) (tstamp 1ae78334-c36e-4754-b60e-8e055a732e4d))
-  (fp_line (start 2.875 -0.5) (end 2.875 0) (layer "F.Fab") (width 0.1) (tstamp 1bd8264a-282c-4439-8ff3-68bdd2ab37e0))
-  (fp_line (start -2.875 0) (end -2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1d10b94f-63cf-4d81-bfaf-83878e4c74cf))
-  (fp_line (start 5.375 0) (end 5.875 0) (layer "F.Fab") (width 0.1) (tstamp 22e8d310-ce32-4588-b03e-eabc2f830186))
-  (fp_line (start 5.875 -0.5) (end 5.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 29abcaf0-2ee3-4c94-8688-bb7541b61a3b))
-  (fp_line (start -3.375 0) (end -2.875 0) (layer "F.Fab") (width 0.1) (tstamp 3742bbe7-525f-4f70-9b52-2e71d5660deb))
-  (fp_line (start 9.125 1.75) (end 9.125 -2.5) (layer "F.Fab") (width 0.1) (tstamp 3a2abdea-e405-42cb-b5da-eb0a8c918718))
-  (fp_line (start 1.625 -0.5) (end 1.625 0) (layer "F.Fab") (width 0.1) (tstamp 3a6cfbc8-aecf-4235-9d6b-b40d3a688f68))
-  (fp_line (start -6.875 1.042893) (end -6.375 1.75) (layer "F.Fab") (width 0.1) (tstamp 3b75bdd2-07f1-4b18-ba5a-02ecf33ee923))
-  (fp_line (start 0.375 0) (end 0.875 0) (layer "F.Fab") (width 0.1) (tstamp 44ac56de-8b69-4571-b7d3-1cd662964f29))
-  (fp_line (start 4.625 -0.5) (end 4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 51205d87-1db0-4293-9894-cacf1ef20186))
-  (fp_line (start -4.625 0) (end -4.125 0) (layer "F.Fab") (width 0.1) (tstamp 520dd9f8-f660-4cfd-977a-14118a6528fc))
-  (fp_line (start -2.125 -0.5) (end -2.125 0) (layer "F.Fab") (width 0.1) (tstamp 52e3a872-3061-4c3e-9613-8c56ea2fc980))
-  (fp_line (start 2.125 0) (end 2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 57c5276f-73d0-4e5a-88b6-83a8f7a8ed64))
-  (fp_line (start 1.625 0) (end 2.125 0) (layer "F.Fab") (width 0.1) (tstamp 5ecd7474-5b2c-4172-b40e-c6ca57aee042))
-  (fp_line (start 7.125 0) (end 7.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6458585c-0adf-42bb-87f7-c13cab30abec))
-  (fp_line (start -6.625 0) (end -6.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6ca58bd0-3041-43f3-a784-5714232067c4))
-  (fp_line (start -1.625 0) (end -1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6f5e2e90-f767-4c51-ad0e-b45a46700b49))
-  (fp_line (start 3.375 -0.5) (end 2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 70ebbbac-2a1a-4325-a634-64a296c7d0a0))
-  (fp_line (start -0.875 0) (end -0.375 0) (layer "F.Fab") (width 0.1) (tstamp 82e7b35f-233b-4ca5-8c4d-efdb5204a481))
-  (fp_line (start 2.875 0) (end 3.375 0) (layer "F.Fab") (width 0.1) (tstamp 891466e9-a2f2-4d04-95c6-013ea4e0aac4))
-  (fp_line (start -0.375 0) (end -0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8c2a4201-d2ff-4572-84a9-0c3d248b60dc))
-  (fp_line (start 6.625 -0.5) (end 6.625 0) (layer "F.Fab") (width 0.1) (tstamp 8eef4a09-4b93-49f3-b547-cf7d0edf6452))
-  (fp_line (start -0.875 -0.5) (end -0.875 0) (layer "F.Fab") (width 0.1) (tstamp 8f675893-f1af-48da-927e-7198201ad2c0))
-  (fp_line (start -5.875 0) (end -5.375 0) (layer "F.Fab") (width 0.1) (tstamp 93bced82-8c4e-467a-8db8-6044c45e7f34))
-  (fp_line (start -5.375 -0.5) (end -5.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9ae6880e-f38d-4a93-8f69-32065754c6d6))
-  (fp_line (start 2.125 -0.5) (end 1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp a7b1033f-90de-40a7-a60e-29f1d697d78d))
-  (fp_line (start 0.875 0) (end 0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp aac09a1f-6825-4378-b531-227cdb93399e))
-  (fp_line (start -0.375 -0.5) (end -0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp ae6a1fee-c3d7-452c-b5e1-8dfd354c9c24))
-  (fp_line (start -7.125 0) (end -6.625 0) (layer "F.Fab") (width 0.1) (tstamp b1636a53-2265-41d3-8a11-1ef12a2d84d8))
-  (fp_line (start -4.125 -0.5) (end -4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp b3648c93-b3d9-4a79-9de2-4665daf145b6))
-  (fp_line (start -2.875 -0.5) (end -3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp b7c36720-718d-4a9f-abd1-ed5b5093b12a))
-  (fp_line (start 6.625 0) (end 7.125 0) (layer "F.Fab") (width 0.1) (tstamp b9f0bd0f-243f-4522-bc97-34c6725aa131))
-  (fp_line (start -4.625 -0.5) (end -4.625 0) (layer "F.Fab") (width 0.1) (tstamp ba484e5d-971b-4b2a-a57f-831cb87371c5))
-  (fp_line (start 0.375 -0.5) (end 0.375 0) (layer "F.Fab") (width 0.1) (tstamp bd3b6f60-4491-4256-aec7-069c0873242d))
-  (fp_line (start -7.125 -0.5) (end -7.125 0) (layer "F.Fab") (width 0.1) (tstamp bdc226fe-c3b5-46d5-8632-0228dde937e3))
-  (fp_line (start -9.125 1.75) (end 9.125 1.75) (layer "F.Fab") (width 0.1) (tstamp c4660ed3-840b-45fc-9295-15152952bf76))
-  (fp_line (start 4.125 0) (end 4.625 0) (layer "F.Fab") (width 0.1) (tstamp c9a0a9a8-46a4-451d-bb5c-b343b46ddb25))
-  (fp_line (start -3.375 -0.5) (end -3.375 0) (layer "F.Fab") (width 0.1) (tstamp c9b17aa5-66bb-4f6d-b885-4dd7eeb3a567))
-  (fp_line (start 4.125 -0.5) (end 4.125 0) (layer "F.Fab") (width 0.1) (tstamp c9e5ffc9-1a9b-40c0-ab29-c4840294e312))
-  (fp_line (start 4.625 0) (end 4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp cae18a34-3f84-4c0a-8694-f2f802aed4b3))
-  (fp_line (start -7.375 1.75) (end -6.875 1.042893) (layer "F.Fab") (width 0.1) (tstamp cecbbc5d-5332-497e-a4c5-ee2147298094))
-  (fp_line (start -9.125 -2.5) (end 9.125 -2.5) (layer "F.Fab") (width 0.1) (tstamp d28615e7-5232-4720-ae6b-14bb6033c1f0))
-  (fp_line (start -6.625 -0.5) (end -7.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp e116ed68-a621-4837-8197-e2039d63a7d0))
-  (fp_line (start 7.125 -0.5) (end 6.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp e997f898-537c-4f82-b922-70cfe4449b4c))
-  (fp_line (start -5.375 0) (end -5.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp ea081d1e-4280-40cf-99ff-5e3a6011018a))
-  (fp_line (start 5.875 0) (end 5.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp ee8f636a-0011-440d-aa34-c2a0feef7299))
-  (fp_line (start -1.625 -0.5) (end -2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp f5110449-1401-40dd-aa34-cca44d12628a))
-  (fp_line (start 5.375 -0.5) (end 5.375 0) (layer "F.Fab") (width 0.1) (tstamp f80c7caf-0038-4a9e-b358-14e05d7d9aff))
-  (pad "1" smd roundrect (at -6.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 220f48f0-516a-4a87-8966-bedbfb800d57))
-  (pad "2" smd roundrect (at -5.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a39a6422-17ff-4303-8a1a-d2c3ab86b615))
-  (pad "3" smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6eb2d900-3b04-42a3-8474-918d3d4c43e7))
-  (pad "4" smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e4b8fcc7-03f8-41ab-90e6-0c5c7ee5db27))
-  (pad "5" smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5188937a-1bf1-4a16-9d54-791a8b3f5ce8))
-  (pad "6" smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c0b38c9b-557c-4684-9101-5e1062261e52))
-  (pad "7" smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ba6e1200-a7d7-433c-afe5-70b736db53b3))
-  (pad "8" smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 28f14ced-ea46-40cf-91d1-f0e45fd14106))
-  (pad "9" smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ed1c3e22-dc3f-426f-8ae4-2412754c0eed))
-  (pad "10" smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3f1adeb4-127a-4693-8c2a-bef8d745d90c))
-  (pad "11" smd roundrect (at 5.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 17566374-fd90-43c4-a2f8-7d8a138b193d))
-  (pad "12" smd roundrect (at 6.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 92974388-06e5-42e7-a9f4-865557b03a6a))
-  (pad "MP" smd roundrect (at 8.725 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0f00d275-a88f-4aab-abaf-e335a525dfc3))
-  (pad "MP" smd roundrect (at -8.725 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 842b5a37-f9bf-4f6f-b513-4010095923a1))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM12B-GHS-TBT_1x12-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical.kicad_mod
index 48d9f3b91..afeafa4f5 100644
--- a/Connector_JST.pretty/JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,105 +1,169 @@
-(footprint "JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM13B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 74a4b808-f28b-4d33-a740-c2a3b4c1ceb6)
   )
-  (fp_text value "JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1a56afe0-ddb7-47d2-8417-7f620c4f0d57)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -9.75 1.75) (end 9.75 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.86 0.26) (end -9.86 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.86 1.86) (end -8.06 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.06 1.86) (end -8.06 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 0.26) (end 9.86 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 1.86) (end 8.06 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.59 -2.61) (end 8.59 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.75 -2.5) (end 9.75 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 1.75) (end -9.75 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 1.75) (end 9.75 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -0.5) (end -7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 0) (end -7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 0) (end -7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -0.5) (end -7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.5) (end -6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0) (end -6 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 0) (end -6 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -0.5) (end -6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -0.5) (end -5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 0) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 0) (end -2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -0.5) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.5) (end -1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 0) (end 1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 -0.5) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -0.5) (end 2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 0) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 0) (end 5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -0.5) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 -0.5) (end 6 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 0) (end 6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 0) (end 6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -0.5) (end 6 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -0.5) (end 7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 0) (end 7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 0) (end 7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -0.5) (end 7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.35 -3.3) (end -10.35 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.35 3.3) (end 10.35 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.35 3.3) (end 10.35 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.35 -3.3) (end -10.35 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8 1.75) (end -7.5 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 1.042893) (end -7 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 7.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.35 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 9.35 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4c3c1342-6cd6-4f80-9a7c-56fb1b65b05b)
   )
-  (fp_line (start 9.86 0.26) (end 9.86 1.86) (layer "F.SilkS") (width 0.12) (tstamp 31a11c51-4d00-403c-b282-a49ab77ae808))
-  (fp_line (start -9.86 1.86) (end -8.06 1.86) (layer "F.SilkS") (width 0.12) (tstamp 55bdd0e1-15d7-4625-a808-991338c9ec3a))
-  (fp_line (start 9.86 1.86) (end 8.06 1.86) (layer "F.SilkS") (width 0.12) (tstamp a85ffbf6-d464-4789-92b7-b195c631c585))
-  (fp_line (start -9.86 0.26) (end -9.86 1.86) (layer "F.SilkS") (width 0.12) (tstamp ab34e797-b207-439f-be1a-1b2f93d23790))
-  (fp_line (start -8.59 -2.61) (end 8.59 -2.61) (layer "F.SilkS") (width 0.12) (tstamp d07130fe-ab85-433e-b8ef-5acfc3488095))
-  (fp_line (start -8.06 1.86) (end -8.06 2.8) (layer "F.SilkS") (width 0.12) (tstamp dea5d333-60a3-4004-84d8-aefabe3ba88d))
-  (fp_line (start -10.35 3.3) (end 10.35 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 12a48e67-52f5-4ad4-9f85-766a67276943))
-  (fp_line (start 10.35 3.3) (end 10.35 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 1e2de77b-e01a-49fa-94b6-c70600c9eae3))
-  (fp_line (start -10.35 -3.3) (end -10.35 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 65f95d66-ff3a-4610-ae9f-6be0fded304d))
-  (fp_line (start 10.35 -3.3) (end -10.35 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp bf27b066-cc69-4e24-b753-5f9c46c78618))
-  (fp_line (start 7.25 -0.5) (end 7.25 0) (layer "F.Fab") (width 0.1) (tstamp 0005a857-5b61-49cf-9d70-ce83ccb47407))
-  (fp_line (start -4.75 -0.5) (end -5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 027459be-be1a-4845-aca6-794b0ad8066c))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 04faf142-41f7-4de6-a699-92a8b4e2cd27))
-  (fp_line (start 7.75 -0.5) (end 7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 053c784e-ba00-4c6a-bbf2-a22a213b8013))
-  (fp_line (start -1 0) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 061e9788-dc19-4e17-8fc6-201dfbf954de))
-  (fp_line (start 7.25 0) (end 7.75 0) (layer "F.Fab") (width 0.1) (tstamp 083d1601-e542-4615-9a3f-5080370963f3))
-  (fp_line (start -2.75 0) (end -2.25 0) (layer "F.Fab") (width 0.1) (tstamp 135a8c4c-3c24-436c-803a-78e454a4a293))
-  (fp_line (start 5.25 -0.5) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 145b975e-7d99-4399-8abd-f4d093d8a8c7))
-  (fp_line (start -2.25 0) (end -2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1a972579-c43a-4f50-b669-6bc32bf50424))
-  (fp_line (start 1.5 -0.5) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 22c5cce0-e87f-400c-8fcb-fa1414db0d37))
-  (fp_line (start -5.25 0) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp 2582ae73-bb1e-4485-ad07-1957bd8c4121))
-  (fp_line (start 9.75 1.75) (end 9.75 -2.5) (layer "F.Fab") (width 0.1) (tstamp 2f4129a0-c041-4c91-9884-18e3311f4023))
-  (fp_line (start -1 -0.5) (end -1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 32366e14-ced5-4d29-b9b8-9dd271d70c59))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3561d7e5-3d7a-460b-b185-4f19765fa30c))
-  (fp_line (start 2.75 0) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3c8802c7-95f1-4cde-8bb9-7627948361b1))
-  (fp_line (start -7.5 1.042893) (end -7 1.75) (layer "F.Fab") (width 0.1) (tstamp 3f3713cb-b166-4048-b84a-ed6ff8862e10))
-  (fp_line (start -8 1.75) (end -7.5 1.042893) (layer "F.Fab") (width 0.1) (tstamp 40728573-35b0-4248-b7fe-f38969ebb1f7))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 40d3762e-6bb4-4145-a51d-980ed96b3289))
-  (fp_line (start -7.25 -0.5) (end -7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4572fcbf-b823-4bae-abb2-8ea2bed9d2d9))
-  (fp_line (start 2.75 -0.5) (end 2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 47176332-e6e3-4682-8b51-01f098db14b8))
-  (fp_line (start -5.25 -0.5) (end -5.25 0) (layer "F.Fab") (width 0.1) (tstamp 48bee6ce-569d-404e-8003-925420245842))
-  (fp_line (start 6.5 0) (end 6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 546da01b-89b2-441b-974a-10c8907098c5))
-  (fp_line (start -6 0) (end -6 -0.5) (layer "F.Fab") (width 0.1) (tstamp 64d3c9a5-9a94-4a45-bff8-b8111c3392fa))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6c4a5300-085f-4fb2-b28c-6684c0bc03c3))
-  (fp_line (start -1.5 0) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 709afd81-3b71-4272-a9c7-a898d8e8704a))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7378c921-a879-40bb-a093-450c90d21703))
-  (fp_line (start -6.5 0) (end -6 0) (layer "F.Fab") (width 0.1) (tstamp 7542063a-2973-4143-83dc-109f4c921b5c))
-  (fp_line (start -2.75 -0.5) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp 7ad8a108-b7b3-473f-b484-ad3178f7a614))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8077f9ad-b0ef-4b77-ad0d-cfa536a7f4b9))
-  (fp_line (start -1.5 -0.5) (end -1.5 0) (layer "F.Fab") (width 0.1) (tstamp 8208fdc1-67f1-43ed-902e-600b3016b28e))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 88b19481-bbe4-4a30-810e-85755cf8584a))
-  (fp_line (start -9.75 1.75) (end -9.75 -2.5) (layer "F.Fab") (width 0.1) (tstamp 97228887-6644-48bb-b1af-aabb32fb9d26))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp 97ee549b-fd37-456c-8a7a-2d77e6fc7d6f))
-  (fp_line (start -6.5 -0.5) (end -6.5 0) (layer "F.Fab") (width 0.1) (tstamp a4d5d77a-6fa8-4471-b289-0e6c841fc503))
-  (fp_line (start 4.75 0) (end 5.25 0) (layer "F.Fab") (width 0.1) (tstamp ae39007d-1aca-4719-84ed-57be3a98e0e0))
-  (fp_line (start -6 -0.5) (end -6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b3285b60-9c86-492d-a770-bcc8229494f9))
-  (fp_line (start -7.25 0) (end -7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp b347a06c-13db-4e47-bd82-b58e6125bd3a))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp b37b882a-8584-4432-bd4b-6f5af93f2f38))
-  (fp_line (start -7.75 0) (end -7.25 0) (layer "F.Fab") (width 0.1) (tstamp b498cfb0-986f-461b-8851-3abae297a013))
-  (fp_line (start 2.25 -0.5) (end 2.25 0) (layer "F.Fab") (width 0.1) (tstamp b699cb7c-4827-41b9-838c-e607da750add))
-  (fp_line (start 1 0) (end 1.5 0) (layer "F.Fab") (width 0.1) (tstamp bdd3e533-e1e3-4599-82fd-70ae0cbfdc2a))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp c20a76e0-f41c-4b10-9135-d133b66448cf))
-  (fp_line (start -4.75 0) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp c53812ed-f2b2-40a9-9ac4-d6fcefbf2b18))
-  (fp_line (start 6 -0.5) (end 6 0) (layer "F.Fab") (width 0.1) (tstamp c66fddeb-dbc5-4dba-b46d-79445fd6548a))
-  (fp_line (start 7.75 0) (end 7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp c72ac6d3-a6fb-490f-9a67-e6f00680cd02))
-  (fp_line (start 4.75 -0.5) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp c7642b31-1ad0-432e-92f7-9b0d2c0e5c22))
-  (fp_line (start 2.25 0) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp c93c139a-9dc3-4b03-aa76-40fd1f4e523d))
-  (fp_line (start -9.75 1.75) (end 9.75 1.75) (layer "F.Fab") (width 0.1) (tstamp c949e6e1-4571-4c83-83ef-5a7542efb32d))
-  (fp_line (start 6 0) (end 6.5 0) (layer "F.Fab") (width 0.1) (tstamp ccd46c34-86c7-4b17-b132-e79f9fb1ae9f))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp cd7fa2d0-45e2-4610-8a1b-6916a10b0c39))
-  (fp_line (start -7.75 -0.5) (end -7.75 0) (layer "F.Fab") (width 0.1) (tstamp db59c6c4-99c5-4a81-beee-6d0609e50255))
-  (fp_line (start -9.75 -2.5) (end 9.75 -2.5) (layer "F.Fab") (width 0.1) (tstamp db7a050e-6b86-4489-9906-88f2d1a4add2))
-  (fp_line (start -2.25 -0.5) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp dd0f109e-b278-4f45-9537-347fb09e0163))
-  (fp_line (start 1.5 0) (end 1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e0c09529-a35e-4903-ad81-fff9034d3296))
-  (fp_line (start 6.5 -0.5) (end 6 -0.5) (layer "F.Fab") (width 0.1) (tstamp e6b476ae-fff3-44c3-bccf-90715abea4bc))
-  (fp_line (start 1 -0.5) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp ea24ab8b-9001-4c97-b91d-01786c6a943c))
-  (fp_line (start 5.25 0) (end 5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp f1be9bf1-0289-4553-9219-54bf71c493a8))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp f30d7ab4-0067-49e5-b963-a3f0f080c4c5))
-  (pad "1" smd roundrect (at -7.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 10780149-f4ca-4afb-b23d-dd2a80df6975))
-  (pad "2" smd roundrect (at -6.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f79a6321-ea29-464e-80d7-8cdb81fc1ae8))
-  (pad "3" smd roundrect (at -5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp be4b2347-cc34-4a94-9fe0-673e2cf31247))
-  (pad "4" smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c48a2b94-cfd9-40b7-b1c2-e19130f2128b))
-  (pad "5" smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c49c33ff-2393-483c-a118-318973a28e12))
-  (pad "6" smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1c8801dc-b56a-45f2-b837-0dc6d2fc7923))
-  (pad "7" smd roundrect (at 0 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 041ef5b4-3e78-4d3f-8954-c298cbb49d38))
-  (pad "8" smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c4343484-19ea-454e-ac41-9acdc8eea3c2))
-  (pad "9" smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ba05ab04-4809-4915-bb5b-fa7cf35a6ff1))
-  (pad "10" smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7b8bca9c-b77a-43b3-b653-41bc30f01b01))
-  (pad "11" smd roundrect (at 5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cfb9620d-95ad-4be3-a5f1-15e0299e08b8))
-  (pad "12" smd roundrect (at 6.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 91ec88a9-9981-4890-b744-5e01fbbc66ba))
-  (pad "13" smd roundrect (at 7.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d93a1a31-c56d-415e-bf90-9aab27f45902))
-  (pad "MP" smd roundrect (at -9.35 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 04ff5827-00fe-4d59-a920-ea57ecf5b428))
-  (pad "MP" smd roundrect (at 9.35 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2a4a03c9-d575-4190-8601-286db200adf6))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM13B-GHS-TBT_1x13-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical.kicad_mod
index 4aa4b1030..e014d8d63 100644
--- a/Connector_JST.pretty/JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,110 +1,178 @@
-(footprint "JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM14B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7fec648c-dd0c-4cd1-9491-f9a4d9ada069)
   )
-  (fp_text value "JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d76acf90-32a5-4a24-a6e0-809287af80f1)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -10.375 1.75) (end 10.375 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.485 0.26) (end -10.485 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.485 1.86) (end -8.685 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.685 1.86) (end -8.685 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.485 0.26) (end 10.485 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.485 1.86) (end 8.685 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.215 -2.61) (end 9.215 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.375 -2.5) (end 10.375 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.375 1.75) (end -10.375 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.375 1.75) (end 10.375 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.375 -0.5) (end -8.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.375 0) (end -7.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.875 0) (end -7.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.875 -0.5) (end -8.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.125 -0.5) (end -7.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.125 0) (end -6.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.625 0) (end -6.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.625 -0.5) (end -7.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.875 -0.5) (end -5.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.875 0) (end -5.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 0) (end -5.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 -0.5) (end -5.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 -0.5) (end -4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.625 0) (end -4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 0) (end -4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 -0.5) (end -4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 -0.5) (end -3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.375 0) (end -2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 0) (end -2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 -0.5) (end -3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 -0.5) (end -2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.125 0) (end -1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 0) (end -1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.625 -0.5) (end -2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 -0.5) (end -0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.875 0) (end -0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 0) (end -0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.375 -0.5) (end -0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 -0.5) (end 0.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.375 0) (end 0.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 0) (end 0.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.875 -0.5) (end 0.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 -0.5) (end 1.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.625 0) (end 2.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 0) (end 2.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.125 -0.5) (end 1.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 -0.5) (end 2.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 0) (end 3.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 0) (end 3.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.375 -0.5) (end 2.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 -0.5) (end 4.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 0) (end 4.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 0) (end 4.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.625 -0.5) (end 4.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 -0.5) (end 5.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 0) (end 5.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.875 0) (end 5.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.875 -0.5) (end 5.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.625 -0.5) (end 6.625 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.625 0) (end 7.125 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.125 0) (end 7.125 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.125 -0.5) (end 6.625 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.875 -0.5) (end 7.875 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.875 0) (end 8.375 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.375 0) (end 8.375 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.375 -0.5) (end 7.875 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.98 -3.3) (end -10.98 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.98 3.3) (end 10.98 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.98 3.3) (end 10.98 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.98 -3.3) (end -10.98 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.625 1.75) (end -8.125 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.125 1.042893) (end -7.625 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5.625 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6.875 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 8.125 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.975 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 9.975 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp acdfec55-7afb-43db-902e-c074a6740ff2)
   )
-  (fp_line (start 10.485 1.86) (end 8.685 1.86) (layer "F.SilkS") (width 0.12) (tstamp 09cb1327-e7a8-4a41-bc6f-6d58247e7ed2))
-  (fp_line (start -9.215 -2.61) (end 9.215 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 0dfc3348-49a2-409e-b1ac-c3899aa8b8e4))
-  (fp_line (start -10.485 0.26) (end -10.485 1.86) (layer "F.SilkS") (width 0.12) (tstamp 39190401-cc3c-4d0f-b00c-14bfcf472e09))
-  (fp_line (start -8.685 1.86) (end -8.685 2.8) (layer "F.SilkS") (width 0.12) (tstamp 414c077d-8fd1-4904-944d-e8decc47a2b9))
-  (fp_line (start 10.485 0.26) (end 10.485 1.86) (layer "F.SilkS") (width 0.12) (tstamp a13e09bd-79ab-41f1-b340-43482fbc1375))
-  (fp_line (start -10.485 1.86) (end -8.685 1.86) (layer "F.SilkS") (width 0.12) (tstamp e0e8d004-a971-4d3a-a108-a7abfc9e9aa3))
-  (fp_line (start -10.98 3.3) (end 10.98 3.3) (layer "F.CrtYd") (width 0.05) (tstamp a01832f8-7a2c-4815-a2cf-3a9a78a44447))
-  (fp_line (start 10.98 -3.3) (end -10.98 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp b0ae274b-f6e6-4b5e-adf1-6862e2a3ade2))
-  (fp_line (start -10.98 -3.3) (end -10.98 3.3) (layer "F.CrtYd") (width 0.05) (tstamp c203796c-15c5-4177-ac49-b8a3a99ed27b))
-  (fp_line (start 10.98 3.3) (end 10.98 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp c689bc13-52d9-4b65-9ecf-172997ec94c1))
-  (fp_line (start -3.375 0) (end -2.875 0) (layer "F.Fab") (width 0.1) (tstamp 0b67ebba-2b7d-4add-831e-1f4879118703))
-  (fp_line (start -5.875 0) (end -5.375 0) (layer "F.Fab") (width 0.1) (tstamp 0c95d6ff-6a31-477a-a2c2-34d7be933915))
-  (fp_line (start -1.625 0) (end -1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1391c3ef-043e-4095-9645-443c3811b91a))
-  (fp_line (start 0.375 -0.5) (end 0.375 0) (layer "F.Fab") (width 0.1) (tstamp 13b6051e-ccf6-41a8-9ed8-fe6e5ad47c5c))
-  (fp_line (start 2.875 0) (end 3.375 0) (layer "F.Fab") (width 0.1) (tstamp 144dfe90-f46f-4f2b-984e-26b528af13e6))
-  (fp_line (start -7.125 0) (end -6.625 0) (layer "F.Fab") (width 0.1) (tstamp 146ad319-f115-4f5b-9bf7-4d44ea906c6f))
-  (fp_line (start -8.625 1.75) (end -8.125 1.042893) (layer "F.Fab") (width 0.1) (tstamp 17b50c3e-ac4f-47e6-9f0e-9640c942bf0a))
-  (fp_line (start -0.375 -0.5) (end -0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 199abcce-b79a-418f-a670-38d20fe2bf17))
-  (fp_line (start -1.625 -0.5) (end -2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 233c2b5c-9042-4bd3-836a-79f03236cd76))
-  (fp_line (start -6.625 0) (end -6.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2e3a0e94-1408-40a2-8622-58fe1fb892d4))
-  (fp_line (start -2.125 0) (end -1.625 0) (layer "F.Fab") (width 0.1) (tstamp 32ce6cd2-2b65-425e-8e68-60135833deef))
-  (fp_line (start 2.875 -0.5) (end 2.875 0) (layer "F.Fab") (width 0.1) (tstamp 381b57ac-2129-47a5-b46f-490e9bc9c2d0))
-  (fp_line (start 6.625 0) (end 7.125 0) (layer "F.Fab") (width 0.1) (tstamp 38832ffa-5da3-44fa-a759-9e4ca3dd5f56))
-  (fp_line (start -0.375 0) (end -0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 39c4a03b-723d-409b-8361-397d07f9c902))
-  (fp_line (start 7.875 0) (end 8.375 0) (layer "F.Fab") (width 0.1) (tstamp 3b851f95-bceb-4319-91e3-6680de5ce1c6))
-  (fp_line (start 3.375 0) (end 3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3d2d7338-8fd3-4f97-8639-451e9c6db213))
-  (fp_line (start -4.125 -0.5) (end -4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp 44779cca-28c0-40db-a2fd-dbba959ea835))
-  (fp_line (start -8.375 0) (end -7.875 0) (layer "F.Fab") (width 0.1) (tstamp 4991089d-f2c0-41ff-be3e-0465278b7f13))
-  (fp_line (start 2.125 0) (end 2.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 54675fbd-fec5-42db-840e-3fc4e4e3cfa9))
-  (fp_line (start -8.375 -0.5) (end -8.375 0) (layer "F.Fab") (width 0.1) (tstamp 5979c2b0-5824-4ed6-8f51-da0648f0964e))
-  (fp_line (start -7.875 -0.5) (end -8.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5d249cab-3c66-4a84-be3f-2151f092d013))
-  (fp_line (start -10.375 -2.5) (end 10.375 -2.5) (layer "F.Fab") (width 0.1) (tstamp 60561558-c8eb-43b5-a80c-2d46fe28cf9d))
-  (fp_line (start 10.375 1.75) (end 10.375 -2.5) (layer "F.Fab") (width 0.1) (tstamp 645fe5d3-4c83-49bd-ab38-064bb7794468))
-  (fp_line (start -3.375 -0.5) (end -3.375 0) (layer "F.Fab") (width 0.1) (tstamp 657d2544-7448-4632-b425-1ead239963a7))
-  (fp_line (start 6.625 -0.5) (end 6.625 0) (layer "F.Fab") (width 0.1) (tstamp 6afc2596-fe87-4eba-be60-4d52d9d9770b))
-  (fp_line (start 5.875 -0.5) (end 5.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6b1cc7f8-fb2e-4143-9207-74a5eabb684f))
-  (fp_line (start 4.125 0) (end 4.625 0) (layer "F.Fab") (width 0.1) (tstamp 71363b84-ae38-426c-9e3e-b47e5b324d91))
-  (fp_line (start 1.625 -0.5) (end 1.625 0) (layer "F.Fab") (width 0.1) (tstamp 765468ed-624f-4368-93b4-986c30bcbfdb))
-  (fp_line (start -5.375 -0.5) (end -5.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 76ea5631-e362-4a93-9356-d29316228759))
-  (fp_line (start -4.125 0) (end -4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7abbd5c2-465d-421b-b4cb-61c6c64338f9))
-  (fp_line (start -2.125 -0.5) (end -2.125 0) (layer "F.Fab") (width 0.1) (tstamp 7c04c5f2-3e1a-4081-874b-9cc36bd2c9e2))
-  (fp_line (start -5.875 -0.5) (end -5.875 0) (layer "F.Fab") (width 0.1) (tstamp 877c29b5-4c21-4528-a658-427d5210dd69))
-  (fp_line (start -4.625 -0.5) (end -4.625 0) (layer "F.Fab") (width 0.1) (tstamp 8c5452ed-f3c5-46f9-be4b-30867a97d003))
-  (fp_line (start 0.375 0) (end 0.875 0) (layer "F.Fab") (width 0.1) (tstamp 8d6add4b-93e4-4dc4-ac2b-626774c0ff2e))
-  (fp_line (start 0.875 0) (end 0.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp 944eff38-adbb-44cc-b74a-17b8f5dd1564))
-  (fp_line (start -6.625 -0.5) (end -7.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9ae42e3d-94d1-4cb2-a276-0f6333f0a8d7))
-  (fp_line (start -0.875 0) (end -0.375 0) (layer "F.Fab") (width 0.1) (tstamp 9d3a578e-95f7-4289-b1d9-b82b01919077))
-  (fp_line (start 0.875 -0.5) (end 0.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9e7e378b-e8f4-4b16-ab0d-4f1d541c52c4))
-  (fp_line (start 2.125 -0.5) (end 1.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp a0095d7a-ec74-4bfa-a600-c5f9c9808254))
-  (fp_line (start 7.875 -0.5) (end 7.875 0) (layer "F.Fab") (width 0.1) (tstamp ad3e6385-f702-46e7-97bd-5fb2973f5990))
-  (fp_line (start 7.125 0) (end 7.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp b0a112e5-eff7-4646-bcf5-1504b6ac9f95))
-  (fp_line (start 3.375 -0.5) (end 2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp c4933819-9bb7-45ee-9155-1cc0219c82f0))
-  (fp_line (start 8.375 -0.5) (end 7.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp c5564b88-1ea4-4e2b-ba86-7a979084a7ed))
-  (fp_line (start 5.375 0) (end 5.875 0) (layer "F.Fab") (width 0.1) (tstamp c66e5890-b4e1-4576-9023-84f8f556619e))
-  (fp_line (start 4.625 0) (end 4.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp c7c8114c-ee99-4aa5-ad33-d8cdd0c1eca0))
-  (fp_line (start -7.875 0) (end -7.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp c90dc957-d256-43ad-86e9-940fa752cfcf))
-  (fp_line (start -10.375 1.75) (end -10.375 -2.5) (layer "F.Fab") (width 0.1) (tstamp ce49a36c-b652-41bc-9492-37c7cd2421a0))
-  (fp_line (start 4.625 -0.5) (end 4.125 -0.5) (layer "F.Fab") (width 0.1) (tstamp ce9d35af-5f96-4a1c-a43a-e600362a0334))
-  (fp_line (start 5.875 0) (end 5.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp d2ed1679-8b3e-4b41-a472-dfe1181f52da))
-  (fp_line (start -8.125 1.042893) (end -7.625 1.75) (layer "F.Fab") (width 0.1) (tstamp d3911993-f448-4bbe-98e8-70eb8bcf26f3))
-  (fp_line (start -4.625 0) (end -4.125 0) (layer "F.Fab") (width 0.1) (tstamp d9ed6457-4eff-4084-a9a7-d7d2d312f71d))
-  (fp_line (start 4.125 -0.5) (end 4.125 0) (layer "F.Fab") (width 0.1) (tstamp dd69419d-3371-469c-a555-ea03e2b3f162))
-  (fp_line (start 7.125 -0.5) (end 6.625 -0.5) (layer "F.Fab") (width 0.1) (tstamp dea3e0c4-ff6c-4a85-a938-2b43541b23ff))
-  (fp_line (start -10.375 1.75) (end 10.375 1.75) (layer "F.Fab") (width 0.1) (tstamp e1f83f75-8a62-4f34-a20f-fdc696c9940e))
-  (fp_line (start -0.875 -0.5) (end -0.875 0) (layer "F.Fab") (width 0.1) (tstamp e243eb07-6864-4d24-9bdf-e55c933d5375))
-  (fp_line (start 1.625 0) (end 2.125 0) (layer "F.Fab") (width 0.1) (tstamp e3e2ed42-7005-40c1-943a-15848d016fdc))
-  (fp_line (start 8.375 0) (end 8.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp e79caa8d-a9bb-4dc2-a4d1-a4f61a1f239a))
-  (fp_line (start -5.375 0) (end -5.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp f5cc6cbb-af57-4777-8a53-65b15270d91f))
-  (fp_line (start -7.125 -0.5) (end -7.125 0) (layer "F.Fab") (width 0.1) (tstamp fa89e1e6-a0e2-4555-bd3a-c5fc858d96a2))
-  (fp_line (start -2.875 -0.5) (end -3.375 -0.5) (layer "F.Fab") (width 0.1) (tstamp fb271bae-784b-4a28-af33-40a6309b543b))
-  (fp_line (start 5.375 -0.5) (end 5.375 0) (layer "F.Fab") (width 0.1) (tstamp fc42f2a1-3bed-4d80-9f5a-09614e5c6b01))
-  (fp_line (start -2.875 0) (end -2.875 -0.5) (layer "F.Fab") (width 0.1) (tstamp feb285f9-db4d-4a5c-8070-1b72da7e86ee))
-  (pad "1" smd roundrect (at -8.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 26f46c31-92e4-4645-a94d-91157ca99602))
-  (pad "2" smd roundrect (at -6.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2168632a-9ba6-4640-8039-2a1c87d92562))
-  (pad "3" smd roundrect (at -5.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6753ceea-b430-417e-8c64-0ea181f253ec))
-  (pad "4" smd roundrect (at -4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f234ffc-b3b5-4e6f-8b5d-f490f9838d45))
-  (pad "5" smd roundrect (at -3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a9881275-5e88-4987-87b1-f7c775104ac5))
-  (pad "6" smd roundrect (at -1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 33718bb1-d73e-4e04-b085-33f03572b22e))
-  (pad "7" smd roundrect (at -0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 56fc2975-544a-43a1-97ca-a3c7a8b7480d))
-  (pad "8" smd roundrect (at 0.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b8094c1b-cebb-4273-82a1-5ff24e6133d5))
-  (pad "9" smd roundrect (at 1.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b96e1b87-9599-4924-a263-dae92c64ff62))
-  (pad "10" smd roundrect (at 3.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9f2f8a90-4bfd-44d1-94c5-6d8192ee9a8d))
-  (pad "11" smd roundrect (at 4.375 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ae632ee1-7fd5-4d9b-8553-759fed0eca13))
-  (pad "12" smd roundrect (at 5.625 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5895f248-957a-46cc-94f8-71bf6419246a))
-  (pad "13" smd roundrect (at 6.875 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b2f3f014-8c77-43e6-8d1b-959a12a196d1))
-  (pad "14" smd roundrect (at 8.125 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 80fba499-1139-4b2e-b25e-28991de3566d))
-  (pad "MP" smd roundrect (at -9.975 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 429b9591-2a1c-461d-ac24-7a2c6342721e))
-  (pad "MP" smd roundrect (at 9.975 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dbfed31d-b1f2-4930-96ee-2dc177c9236a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM14B-GHS-TBT_1x14-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical.kicad_mod
index 5538bce70..b67859692 100644
--- a/Connector_JST.pretty/JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical.kicad_mod
@@ -1,115 +1,187 @@
-(footprint "JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, BM15B-GHS-TBT (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH side entry")
+  (tags "connector JST GH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 03fe6ae4-c4f5-4d0e-a906-fdfdf7380650)
   )
-  (fp_text value "JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical" (at 0 4) (layer "F.Fab")
+  (fp_text value JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical (at 0 4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e290c962-c322-4b6b-bc99-b4841f9fb99a)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -11 1.75) (end 11 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.11 0.26) (end -11.11 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.11 1.86) (end -9.31 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.31 1.86) (end -9.31 2.8)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.11 0.26) (end 11.11 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.11 1.86) (end 9.31 1.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.84 -2.61) (end 9.84 -2.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11 -2.5) (end 11 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11 1.75) (end -11 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11 1.75) (end 11 -2.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 -0.5) (end -9 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 0) (end -8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 0) (end -8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -0.5) (end -9 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -0.5) (end -7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 0) (end -7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 0) (end -7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -0.5) (end -7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.5) (end -6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0) (end -6 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 0) (end -6 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -0.5) (end -6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -0.5) (end -5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 0) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 0) (end -2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -0.5) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.5) (end -1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 0) (end 1.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.5 -0.5) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -0.5) (end 2.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 0) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 5.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 0) (end 5.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -0.5) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 -0.5) (end 6 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 0) (end 6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 0) (end 6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -0.5) (end 6 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -0.5) (end 7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 0) (end 7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 0) (end 7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -0.5) (end 7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 -0.5) (end 8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 0) (end 9 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9 0) (end 9 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9 -0.5) (end 8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.6 -3.3) (end -11.6 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.6 3.3) (end 11.6 3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.6 3.3) (end 11.6 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.6 -3.3) (end -11.6 -3.3)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.25 1.75) (end -8.75 1.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 1.042893) (end -8.25 1.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -7.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6.25 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 7.5 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 8.75 1.95) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.6 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 10.6 -1.4) (size 1 2.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a01ddb19-647d-4534-b769-d271a7d51aba)
   )
-  (fp_line (start 11.11 1.86) (end 9.31 1.86) (layer "F.SilkS") (width 0.12) (tstamp 533318bb-9216-461b-880c-54f885fc707f))
-  (fp_line (start -9.84 -2.61) (end 9.84 -2.61) (layer "F.SilkS") (width 0.12) (tstamp 6ffd7af8-13a0-43e2-8afa-e5efa62d08ca))
-  (fp_line (start -11.11 0.26) (end -11.11 1.86) (layer "F.SilkS") (width 0.12) (tstamp 890d2405-eeab-47b4-9358-584e63de6cb8))
-  (fp_line (start -11.11 1.86) (end -9.31 1.86) (layer "F.SilkS") (width 0.12) (tstamp 8dabce41-1e0d-48a9-8c53-022f1d61e0e8))
-  (fp_line (start 11.11 0.26) (end 11.11 1.86) (layer "F.SilkS") (width 0.12) (tstamp a0855941-d602-47bd-bd0f-66f1956ff15d))
-  (fp_line (start -9.31 1.86) (end -9.31 2.8) (layer "F.SilkS") (width 0.12) (tstamp c641dde9-6bc1-48be-b57b-1ae693525ab5))
-  (fp_line (start 11.6 3.3) (end 11.6 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 195a1a5b-3e95-4b97-ba7f-188835a7fc4c))
-  (fp_line (start -11.6 -3.3) (end -11.6 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 59e6c467-73ac-4ce8-8945-78170c251f07))
-  (fp_line (start -11.6 3.3) (end 11.6 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 892c432e-f4fd-4399-8544-40303d5065d2))
-  (fp_line (start 11.6 -3.3) (end -11.6 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp cca5d042-3eac-42e0-821f-948dea96d602))
-  (fp_line (start 5.25 -0.5) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0449c667-b0a5-42af-9760-be627b2a4921))
-  (fp_line (start -1 0) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 051b939b-094d-4f7a-857f-c7ff814cf2ca))
-  (fp_line (start -2.25 0) (end -2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0f9cfe82-fc88-4618-8ac2-3763b235ad1f))
-  (fp_line (start -11 1.75) (end 11 1.75) (layer "F.Fab") (width 0.1) (tstamp 10fa8dc6-34df-4443-bd92-06a48bd5b2e8))
-  (fp_line (start 1 -0.5) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 11b97ac3-93dc-48cf-837b-02350653a911))
-  (fp_line (start -7.75 0) (end -7.25 0) (layer "F.Fab") (width 0.1) (tstamp 144ae327-2db6-402b-9c5e-ab1f7ec8d832))
-  (fp_line (start -6.5 -0.5) (end -6.5 0) (layer "F.Fab") (width 0.1) (tstamp 15a785b1-30bf-4545-8d65-61ee073e1254))
-  (fp_line (start -11 -2.5) (end 11 -2.5) (layer "F.Fab") (width 0.1) (tstamp 1836585c-b3b4-4de1-b9a1-a6ada629e1ba))
-  (fp_line (start 7.75 -0.5) (end 7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1c1f29b1-bdb8-4e1b-9231-c927a96e6d57))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp 243be280-9d84-47e3-8810-532680212a6c))
-  (fp_line (start -8.5 -0.5) (end -9 -0.5) (layer "F.Fab") (width 0.1) (tstamp 274e4aff-e3fd-4c9c-b622-c76c45da2e88))
-  (fp_line (start 1 0) (end 1.5 0) (layer "F.Fab") (width 0.1) (tstamp 32b846d8-4acd-4694-a849-042b123cc764))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 357132a2-0da5-47f2-8b03-9fda498cde41))
-  (fp_line (start -2.25 -0.5) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 42851cb4-dd9f-4a7d-a7fa-cb2bb3113fe4))
-  (fp_line (start -2.75 0) (end -2.25 0) (layer "F.Fab") (width 0.1) (tstamp 45648362-0610-44b6-bd02-efebdc6fc766))
-  (fp_line (start -9 -0.5) (end -9 0) (layer "F.Fab") (width 0.1) (tstamp 47b82262-a0d8-4fe2-a246-e44e918d3bc9))
-  (fp_line (start 2.25 0) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 4a246781-6071-4512-b651-8e3b837f5cad))
-  (fp_line (start 2.75 0) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4a835197-533b-45a0-9d64-f5e88edd143e))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4b5b60d8-5bb6-4fef-a712-26198825c55b))
-  (fp_line (start -11 1.75) (end -11 -2.5) (layer "F.Fab") (width 0.1) (tstamp 52d22a86-59c1-47d7-aead-d54e25a68f02))
-  (fp_line (start -7.25 0) (end -7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5459c8a7-4abc-43e2-b50f-48ed59aa4f35))
-  (fp_line (start -1.5 -0.5) (end -1.5 0) (layer "F.Fab") (width 0.1) (tstamp 5588d0d5-8720-4315-b1a5-1e0241275b70))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 59c962f2-6c51-4322-bb73-4ec2d458305f))
-  (fp_line (start -4.75 -0.5) (end -5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5ac5667f-62bb-45ef-93f2-2f616221aa0f))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp 5b37179f-2c04-4df3-b045-88aa67ec1e0d))
-  (fp_line (start -9.25 1.75) (end -8.75 1.042893) (layer "F.Fab") (width 0.1) (tstamp 61028648-88a9-4e73-b5b4-d75a4e5e8291))
-  (fp_line (start 9 -0.5) (end 8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6277b5fb-f358-4abd-9515-e91436ac3dce))
-  (fp_line (start 4.75 0) (end 5.25 0) (layer "F.Fab") (width 0.1) (tstamp 67edf040-f1e1-444d-99eb-b2720a97bb55))
-  (fp_line (start 7.25 0) (end 7.75 0) (layer "F.Fab") (width 0.1) (tstamp 67f8910d-f3a3-41c0-b328-643e2a596233))
-  (fp_line (start 6.5 0) (end 6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6c0a6a76-ed21-4231-b72b-da6b50e4a101))
-  (fp_line (start 7.75 0) (end 7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6f899462-316b-46df-82ca-6658166a1e77))
-  (fp_line (start -7.75 -0.5) (end -7.75 0) (layer "F.Fab") (width 0.1) (tstamp 704fac7f-9422-42c5-9b91-9e3128ab06e5))
-  (fp_line (start -4.75 0) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7ad2145c-5db5-44de-9e52-a3f7732cf078))
-  (fp_line (start 6 -0.5) (end 6 0) (layer "F.Fab") (width 0.1) (tstamp 80cd41e0-8b92-45a6-a3ed-bb3cbf14c25b))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 80ffdea5-0a52-493e-a7d8-33a961c06571))
-  (fp_line (start 8.5 -0.5) (end 8.5 0) (layer "F.Fab") (width 0.1) (tstamp 8676f6d4-9e9b-4cf6-8695-8e7a2cff87ab))
-  (fp_line (start 6 0) (end 6.5 0) (layer "F.Fab") (width 0.1) (tstamp 8f2a3102-ca06-4ba1-841b-2bf04d703782))
-  (fp_line (start -6.5 0) (end -6 0) (layer "F.Fab") (width 0.1) (tstamp 93daf88d-a082-4476-af9c-4e0b262943e9))
-  (fp_line (start 2.25 -0.5) (end 2.25 0) (layer "F.Fab") (width 0.1) (tstamp 9983d757-fd0a-458b-9414-f1ceaf684180))
-  (fp_line (start 6.5 -0.5) (end 6 -0.5) (layer "F.Fab") (width 0.1) (tstamp 99977386-2f8c-450a-9ee9-0cf0ec535d41))
-  (fp_line (start -8.5 0) (end -8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9e4a7b54-0c5e-47c1-9ca5-725ce25164ee))
-  (fp_line (start -9 0) (end -8.5 0) (layer "F.Fab") (width 0.1) (tstamp 9f711d9c-2b96-4def-8f20-3cd576bb3068))
-  (fp_line (start 2.75 -0.5) (end 2.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp a0919914-fc5d-42ad-bc9a-8d98bb6320f7))
-  (fp_line (start -5.25 0) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp a5666441-f629-45fe-bf3b-f8d5d1f2da96))
-  (fp_line (start -7.25 -0.5) (end -7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp a86de539-e87b-4170-8fbc-a740495a398a))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp a9d0f472-33f0-48b0-a0fc-b052a13abca9))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp afbf32cb-1e9d-44c4-ae1c-21eb5bcdebcf))
-  (fp_line (start -1 -0.5) (end -1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b78b6dab-84fb-40d2-befe-a068166f7754))
-  (fp_line (start -6 -0.5) (end -6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp c0494c46-4979-4761-a3f5-0bbab9c52087))
-  (fp_line (start 11 1.75) (end 11 -2.5) (layer "F.Fab") (width 0.1) (tstamp c331dd07-dbf7-47ef-8731-ec856355c2c4))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp d0688ef4-b6a2-4362-9236-7634cb65d392))
-  (fp_line (start -2.75 -0.5) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp d47bc97b-3bac-408f-97c5-afc283dbb6e7))
-  (fp_line (start -1.5 0) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp d6c3bdca-13a7-4a8b-9e14-69bd47596364))
-  (fp_line (start 1.5 -0.5) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp d7f5a5d6-f101-4c67-8f55-4334044d3a78))
-  (fp_line (start -8.75 1.042893) (end -8.25 1.75) (layer "F.Fab") (width 0.1) (tstamp dc4c5d52-bdaa-478d-8615-359c1afa8408))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp dd594e8d-17cd-4419-b162-05c8031ca721))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp e35acc35-9b8f-45fc-b4e9-a2660dcb7fa0))
-  (fp_line (start 1.5 0) (end 1.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e850f6ba-6a4e-40b4-9c91-e2afad81d7d4))
-  (fp_line (start 4.75 -0.5) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp ea6edd9e-8a0c-42bd-bf84-ebc0c9cf3024))
-  (fp_line (start 7.25 -0.5) (end 7.25 0) (layer "F.Fab") (width 0.1) (tstamp ec917f7d-68d5-4a13-a065-447fd2df3c11))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp f142fac1-3cca-43e1-9116-f819a110cc16))
-  (fp_line (start 8.5 0) (end 9 0) (layer "F.Fab") (width 0.1) (tstamp f2e80e4e-f45e-4fc4-8a62-5252b7a09b49))
-  (fp_line (start 5.25 0) (end 5.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp f3b6b8d4-e2ae-4ed9-a93f-6792dbe72a61))
-  (fp_line (start -6 0) (end -6 -0.5) (layer "F.Fab") (width 0.1) (tstamp f4dc14ad-5eb8-4e72-8794-f31c9d18695a))
-  (fp_line (start -5.25 -0.5) (end -5.25 0) (layer "F.Fab") (width 0.1) (tstamp f72f9c31-9428-4f54-a642-a5663fc5fd3a))
-  (fp_line (start 9 0) (end 9 -0.5) (layer "F.Fab") (width 0.1) (tstamp fe3d0ef3-28a9-4760-ac40-2aa98ae3c0b0))
-  (pad "1" smd roundrect (at -8.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 532c33ef-2978-41ee-8c55-6a163d4fb419))
-  (pad "2" smd roundrect (at -7.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b994e62a-478a-43db-af21-9215ae9ddccb))
-  (pad "3" smd roundrect (at -6.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp efe0f80e-1983-44bd-bf81-bffdb580c25e))
-  (pad "4" smd roundrect (at -5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c6edb425-c281-47a4-83a4-911002ebce10))
-  (pad "5" smd roundrect (at -3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ff8d6c08-7ced-4a10-80a4-0355870074e4))
-  (pad "6" smd roundrect (at -2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e5caa1f1-dd70-4b1a-9635-a0bbf7a67911))
-  (pad "7" smd roundrect (at -1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f818c50-f7a6-4db2-a2a0-832872087c97))
-  (pad "8" smd roundrect (at 0 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 606757bc-f088-41fa-9f8c-178d5f587db6))
-  (pad "9" smd roundrect (at 1.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 02818154-2f8d-4358-8392-04117339764b))
-  (pad "10" smd roundrect (at 2.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 575cb8c7-2ba4-4a93-aafb-e8494c4c4c43))
-  (pad "11" smd roundrect (at 3.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f69f4a24-f5a8-47ab-8a6a-2458b1189d77))
-  (pad "12" smd roundrect (at 5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ffe035d6-4b68-41a8-9516-664deb33da21))
-  (pad "13" smd roundrect (at 6.25 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 40686ec6-fa5f-4445-9e35-287a49d4a6a8))
-  (pad "14" smd roundrect (at 7.5 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e0c35ae6-800d-4757-990f-5f9dc531d2e8))
-  (pad "15" smd roundrect (at 8.75 1.95) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bf3bd91e-4a99-42a8-86bd-8eb1d5c9e51e))
-  (pad "MP" smd roundrect (at -10.6 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 61437217-709d-4454-a138-4592ba31c921))
-  (pad "MP" smd roundrect (at 10.6 -1.4) (size 1 2.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 90b9d00b-5188-4224-be04-761776331416))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_BM15B-GHS-TBT_1x15-1MP_P1.25mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal.kicad_mod
index a09eeb13c..c872851a0 100644
--- a/Connector_JST.pretty/JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,42 +1,54 @@
-(footprint "JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM02B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2a4c5c67-340e-4bab-9b9b-d6d839649738)
   )
-  (fp_text value "JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a82cf6e7-df3c-427b-97ab-a22eeff61d68)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -2.875 -1.6) (end 2.875 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.985 -0.26) (end -2.985 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.985 -1.71) (end -1.185 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.185 -1.71) (end -1.185 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.985 -0.26) (end 2.985 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.985 -1.71) (end 1.185 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.715 2.56) (end 1.715 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.875 2.45) (end 2.875 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.875 -1.6) (end -2.875 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.875 -1.6) (end 2.875 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.48 -3.2) (end -3.48 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.48 3.2) (end 3.48 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.48 3.2) (end 3.48 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.48 -3.2) (end -3.48 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.125 -1.6) (end -0.625 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.625 -0.892893) (end -0.125 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.475 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 2.475 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c1844995-b85d-46f2-9829-e184d4934ced)
   )
-  (fp_line (start 2.985 -1.71) (end 1.185 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 278b977b-839e-4184-90d4-988abee28d99))
-  (fp_line (start -2.985 -0.26) (end -2.985 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 70340f17-2664-4621-9c7f-976a9a87391b))
-  (fp_line (start -1.715 2.56) (end 1.715 2.56) (layer "F.SilkS") (width 0.12) (tstamp 98b45cf3-135f-4032-9467-e375fbf4630f))
-  (fp_line (start 2.985 -0.26) (end 2.985 -1.71) (layer "F.SilkS") (width 0.12) (tstamp b26ca87e-114b-4c2c-b3d5-a13959716fa5))
-  (fp_line (start -2.985 -1.71) (end -1.185 -1.71) (layer "F.SilkS") (width 0.12) (tstamp c13f064f-adda-42e5-adfa-215cfa6e62a8))
-  (fp_line (start -1.185 -1.71) (end -1.185 -2.7) (layer "F.SilkS") (width 0.12) (tstamp ffafbe98-656a-4117-8953-bbd10dd92774))
-  (fp_line (start 3.48 3.2) (end 3.48 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 1f018c39-820a-4078-9c74-6527e2d197df))
-  (fp_line (start -3.48 3.2) (end 3.48 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 1fcb94f9-8ae4-4872-8be9-97258019b7c6))
-  (fp_line (start -3.48 -3.2) (end -3.48 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 37d578ea-997e-49a1-8b2e-dd4f9f97fcf2))
-  (fp_line (start 3.48 -3.2) (end -3.48 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 94a3e06f-63e1-4574-8bbb-cd89615c5ab3))
-  (fp_line (start 2.875 -1.6) (end 2.875 2.45) (layer "F.Fab") (width 0.1) (tstamp 5bd2a78d-c561-4c99-b101-4338d2b5e0cb))
-  (fp_line (start -2.875 2.45) (end 2.875 2.45) (layer "F.Fab") (width 0.1) (tstamp 66e85d3a-efb2-4f39-ac61-468c033e75a1))
-  (fp_line (start -2.875 -1.6) (end 2.875 -1.6) (layer "F.Fab") (width 0.1) (tstamp 802afc33-0c16-47b7-af51-de0c903ebc95))
-  (fp_line (start -1.125 -1.6) (end -0.625 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 92074ae3-3f78-4338-aff5-d1a03179af22))
-  (fp_line (start -2.875 -1.6) (end -2.875 2.45) (layer "F.Fab") (width 0.1) (tstamp a11d3842-9085-46e5-ae23-9b226a5aece9))
-  (fp_line (start -0.625 -0.892893) (end -0.125 -1.6) (layer "F.Fab") (width 0.1) (tstamp e8f9b550-f29e-432b-b0d1-c96495e5fb46))
-  (pad "1" smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ca366fcb-80a1-49a7-afa0-1261acb67a93))
-  (pad "2" smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c18f3229-c031-4ef7-a042-965dfa71a06a))
-  (pad "MP" smd roundrect (at 2.475 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c375e7f9-4f1b-4d78-8616-95e6d34d1672))
-  (pad "MP" smd roundrect (at -2.475 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e5efe014-8942-49ee-a7da-2ac6fd5c36f4))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM02B-GHS-TB_1x02-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal.kicad_mod
index 17d920110..d6fcc785a 100644
--- a/Connector_JST.pretty/JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,43 +1,55 @@
-(footprint "JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM03B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3a4adb70-3fa6-43b9-a34e-70795ead83f5)
   )
-  (fp_text value "JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 381106b6-cb49-4631-820a-2bb43a92f529)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.5 -1.6) (end 3.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.61 -0.26) (end -3.61 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.61 -1.71) (end -1.81 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.81 -1.71) (end -1.81 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 -0.26) (end 3.61 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 -1.71) (end 1.81 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.34 2.56) (end 2.34 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.5 2.45) (end 3.5 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -1.6) (end -3.5 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -1.6) (end 3.5 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.1 -3.2) (end -4.1 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.1 3.2) (end 4.1 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.1 3.2) (end 4.1 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.1 -3.2) (end -4.1 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.75 -1.6) (end -1.25 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.892893) (end -0.75 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.1 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.1 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3a43d6c7-618a-40d9-8c33-5b38e1d84a99)
   )
-  (fp_line (start 3.61 -0.26) (end 3.61 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 1974b017-91e7-4ed5-86eb-146953ce17b7))
-  (fp_line (start -3.61 -1.71) (end -1.81 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 2563300a-5499-491d-b5fd-a71351b73052))
-  (fp_line (start -3.61 -0.26) (end -3.61 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 8a526326-e89e-40e3-a583-b15b96e05e7d))
-  (fp_line (start -1.81 -1.71) (end -1.81 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 8dae0f09-c09b-42d6-a3cd-049d0d2eaa1b))
-  (fp_line (start -2.34 2.56) (end 2.34 2.56) (layer "F.SilkS") (width 0.12) (tstamp c520009d-7d8a-49ad-af75-46a2b89de20e))
-  (fp_line (start 3.61 -1.71) (end 1.81 -1.71) (layer "F.SilkS") (width 0.12) (tstamp cd001f45-a1ba-4163-ab79-e6ce0b150efa))
-  (fp_line (start 4.1 3.2) (end 4.1 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 370f9460-33a6-47f3-83cb-a29e91c826d4))
-  (fp_line (start -4.1 3.2) (end 4.1 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 66e13d64-4ebe-48e4-af82-ac30c18cac10))
-  (fp_line (start 4.1 -3.2) (end -4.1 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 8ed667d5-8c5d-4a74-ab12-f77ad2f14514))
-  (fp_line (start -4.1 -3.2) (end -4.1 3.2) (layer "F.CrtYd") (width 0.05) (tstamp f95a21e0-abb0-4f92-a4e6-99b6f1271f75))
-  (fp_line (start -1.75 -1.6) (end -1.25 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 38afc278-45a2-41dc-bb3c-a5c65f7b9d1a))
-  (fp_line (start -3.5 2.45) (end 3.5 2.45) (layer "F.Fab") (width 0.1) (tstamp 4e1ea7c5-56b6-42f2-afe4-a27155df3e52))
-  (fp_line (start -3.5 -1.6) (end -3.5 2.45) (layer "F.Fab") (width 0.1) (tstamp 63ce31fe-dacf-4155-9e40-63410e685d76))
-  (fp_line (start -1.25 -0.892893) (end -0.75 -1.6) (layer "F.Fab") (width 0.1) (tstamp 713644de-5485-4480-b5a5-1fbe7c470f67))
-  (fp_line (start 3.5 -1.6) (end 3.5 2.45) (layer "F.Fab") (width 0.1) (tstamp bdb5e76b-817a-418f-a102-d75dc577b85a))
-  (fp_line (start -3.5 -1.6) (end 3.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp d07a234f-16a2-4d94-97e4-01063448f4fb))
-  (pad "1" smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8a5f583c-62b2-4ef9-9693-37f34003bcfb))
-  (pad "2" smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1675face-5156-49b8-a2a9-278b0f33c9ef))
-  (pad "3" smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00fb5c70-ec4d-4d49-ba28-f9b04704a873))
-  (pad "MP" smd roundrect (at -3.1 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 53c22959-6c09-4b92-9059-d90a97c0e62c))
-  (pad "MP" smd roundrect (at 3.1 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a952dc0f-acdb-4430-a89f-0bd3aa9a73d0))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM03B-GHS-TB_1x03-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal.kicad_mod
index 45e69cb30..d33409c78 100644
--- a/Connector_JST.pretty/JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,44 +1,56 @@
-(footprint "JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM04B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f5fba8aa-81c9-4c8f-9e9e-aabbd2c7a3bd)
   )
-  (fp_text value "JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 509f0035-056f-42ef-9b3e-bf6fbc2c486c)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4.125 -1.6) (end 4.125 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.235 -0.26) (end -4.235 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.235 -1.71) (end -2.435 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.435 -1.71) (end -2.435 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.235 -0.26) (end 4.235 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.235 -1.71) (end 2.435 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.965 2.56) (end 2.965 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.125 2.45) (end 4.125 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.125 -1.6) (end -4.125 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.125 -1.6) (end 4.125 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.72 -3.2) (end -4.72 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.72 3.2) (end 4.72 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.72 3.2) (end 4.72 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.72 -3.2) (end -4.72 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.375 -1.6) (end -1.875 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.875 -0.892893) (end -1.375 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.725 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.725 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2d4ee268-77c3-45c4-abb3-957ce5ce7db1)
   )
-  (fp_line (start -4.235 -0.26) (end -4.235 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 25b8e148-0678-4cc4-a031-cd315813e989))
-  (fp_line (start 4.235 -1.71) (end 2.435 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 4d98fb20-3d12-451f-aeac-099a40a0ef8d))
-  (fp_line (start -4.235 -1.71) (end -2.435 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 5c184b15-c02b-4d9f-b2c0-60513d11a43e))
-  (fp_line (start 4.235 -0.26) (end 4.235 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 776814bd-5ee8-49f9-b602-7ad0bbb9b1db))
-  (fp_line (start -2.435 -1.71) (end -2.435 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 983d2f14-7c9c-4e7f-8a5c-006e8c59de0e))
-  (fp_line (start -2.965 2.56) (end 2.965 2.56) (layer "F.SilkS") (width 0.12) (tstamp f37eaa4f-8049-4007-8485-1ad78af6adf8))
-  (fp_line (start 4.72 -3.2) (end -4.72 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 001cbbdd-d13a-44e2-b7ec-49a6e2be349e))
-  (fp_line (start 4.72 3.2) (end 4.72 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 7898fadc-b2be-40ab-a20d-86e66837de0b))
-  (fp_line (start -4.72 3.2) (end 4.72 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 964a7445-61a2-4c0b-b381-68d5704c84f3))
-  (fp_line (start -4.72 -3.2) (end -4.72 3.2) (layer "F.CrtYd") (width 0.05) (tstamp d14e2923-bf05-4c7a-bf08-5844f08edb68))
-  (fp_line (start -1.875 -0.892893) (end -1.375 -1.6) (layer "F.Fab") (width 0.1) (tstamp 0c5609a6-6f20-417a-a431-4c83b7b07644))
-  (fp_line (start -4.125 2.45) (end 4.125 2.45) (layer "F.Fab") (width 0.1) (tstamp 5689d358-0c29-415a-8f7a-16f5b6e5fb0c))
-  (fp_line (start -4.125 -1.6) (end -4.125 2.45) (layer "F.Fab") (width 0.1) (tstamp 94d11921-5848-411c-91f7-77bf2dfc9599))
-  (fp_line (start -2.375 -1.6) (end -1.875 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 9ebe04b9-9e97-416d-9c62-ba96f1fbf317))
-  (fp_line (start -4.125 -1.6) (end 4.125 -1.6) (layer "F.Fab") (width 0.1) (tstamp a813ccb0-4ecc-4659-9794-e04422cc3b43))
-  (fp_line (start 4.125 -1.6) (end 4.125 2.45) (layer "F.Fab") (width 0.1) (tstamp d8c78ca7-0680-4e53-a08f-0528b49e4c93))
-  (pad "1" smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e57637ba-16ff-45d9-804e-eb5fbdcf6ed3))
-  (pad "2" smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a42eef4a-9603-493e-b1f8-c7fee5b8937a))
-  (pad "3" smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5bbe325a-070d-438a-b479-62fb1a28a694))
-  (pad "4" smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4f34df46-9bfe-4759-9db8-739aad3c455d))
-  (pad "MP" smd roundrect (at 3.725 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 70794cf9-2876-4ec5-8703-370d4b8b90a3))
-  (pad "MP" smd roundrect (at -3.725 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp acc820e0-571a-4f54-9cf2-f1312d1f26fc))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM04B-GHS-TB_1x04-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal.kicad_mod
index 7f3b6cc04..209d25661 100644
--- a/Connector_JST.pretty/JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,45 +1,57 @@
-(footprint "JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM05B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5debfeed-7a02-4a8b-a40b-8e249bd9127a)
   )
-  (fp_text value "JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b7b51daf-5c23-43eb-b097-0e5c4291b1f6)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4.75 -1.6) (end 4.75 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.86 -0.26) (end -4.86 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.86 -1.71) (end -3.06 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.06 -1.71) (end -3.06 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.86 -0.26) (end 4.86 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.86 -1.71) (end 3.06 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.59 2.56) (end 3.59 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.75 2.45) (end 4.75 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -1.6) (end -4.75 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -1.6) (end 4.75 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.35 -3.2) (end -5.35 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.35 3.2) (end 5.35 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.35 3.2) (end 5.35 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.35 -3.2) (end -5.35 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3 -1.6) (end -2.5 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.892893) (end -2 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.35 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 4.35 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ad1294c7-ddda-4bce-bb95-1d27dce3614f)
   )
-  (fp_line (start -3.06 -1.71) (end -3.06 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 1d803a94-6030-4341-b067-7e89e9ec5e25))
-  (fp_line (start -4.86 -1.71) (end -3.06 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 5f2a2b03-afe4-4ad2-a8f4-b882313602eb))
-  (fp_line (start 4.86 -0.26) (end 4.86 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 64ac580e-8e3e-4a73-bcea-e2032a3b7342))
-  (fp_line (start -4.86 -0.26) (end -4.86 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 82a115bb-50d1-42ad-8737-02070c65268b))
-  (fp_line (start -3.59 2.56) (end 3.59 2.56) (layer "F.SilkS") (width 0.12) (tstamp d3454146-9df4-49bc-89c9-ae4ed8ef76a7))
-  (fp_line (start 4.86 -1.71) (end 3.06 -1.71) (layer "F.SilkS") (width 0.12) (tstamp dba053ab-820c-42af-ab6d-00a625ed2dbd))
-  (fp_line (start 5.35 3.2) (end 5.35 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 1b7fc886-81f2-48a0-a7b3-344d0e5eb689))
-  (fp_line (start -5.35 3.2) (end 5.35 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 621be761-62cd-4bef-97e3-34653a53c042))
-  (fp_line (start 5.35 -3.2) (end -5.35 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 8845f79e-ffd1-481e-8e28-24909c9cf1ef))
-  (fp_line (start -5.35 -3.2) (end -5.35 3.2) (layer "F.CrtYd") (width 0.05) (tstamp e0885474-fba3-41e3-a373-25ca20bc0e57))
-  (fp_line (start 4.75 -1.6) (end 4.75 2.45) (layer "F.Fab") (width 0.1) (tstamp 4b0c780b-396b-4374-a6a6-c54059f5d17e))
-  (fp_line (start -4.75 -1.6) (end 4.75 -1.6) (layer "F.Fab") (width 0.1) (tstamp 5bfcc7a9-27e4-42b5-a9ad-15d35f3cef85))
-  (fp_line (start -3 -1.6) (end -2.5 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 8826a32f-abac-4926-8957-374ab3fa293c))
-  (fp_line (start -2.5 -0.892893) (end -2 -1.6) (layer "F.Fab") (width 0.1) (tstamp 9dbfb226-19fa-49f7-9cd6-3997c6523e62))
-  (fp_line (start -4.75 -1.6) (end -4.75 2.45) (layer "F.Fab") (width 0.1) (tstamp dbf667a9-4955-430d-860a-f5c78ee72b11))
-  (fp_line (start -4.75 2.45) (end 4.75 2.45) (layer "F.Fab") (width 0.1) (tstamp f5551054-d703-410a-aee1-6888c8a2e080))
-  (pad "1" smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9ee567ef-d6e6-4eb0-b318-8159ddf1d74b))
-  (pad "2" smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 793615cb-783f-4241-bd95-50ca800a5542))
-  (pad "3" smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c242ca62-082c-4ff4-939f-27b25c77f206))
-  (pad "4" smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cdb4ada3-6e00-418d-bdc3-82ea9a0cd003))
-  (pad "5" smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c36c9fe7-f7ad-4612-809f-5bc34de20de4))
-  (pad "MP" smd roundrect (at 4.35 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 050700ef-280c-453c-af12-beeaf958d320))
-  (pad "MP" smd roundrect (at -4.35 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97e01615-237c-4d7b-b5ed-bc5a6bcb22e0))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM05B-GHS-TB_1x05-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal.kicad_mod
index e4cb72c1c..28af0c7a5 100644
--- a/Connector_JST.pretty/JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,46 +1,58 @@
-(footprint "JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM06B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9a332a75-e2ee-4873-830b-54027dbcf9b1)
   )
-  (fp_text value "JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d6e99564-fe63-4cfe-b319-0c37f2f6459f)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -5.375 -1.6) (end 5.375 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.485 -0.26) (end -5.485 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.485 -1.71) (end -3.685 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.685 -1.71) (end -3.685 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.485 -0.26) (end 5.485 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.485 -1.71) (end 3.685 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.215 2.56) (end 4.215 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.375 2.45) (end 5.375 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.375 -1.6) (end -5.375 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.375 -1.6) (end 5.375 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.98 -3.2) (end -5.98 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.98 3.2) (end 5.98 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.98 3.2) (end 5.98 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.98 -3.2) (end -5.98 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.625 -1.6) (end -3.125 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.125 -0.892893) (end -2.625 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.975 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 4.975 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d0c1b1db-42fc-479d-97d0-e6b1117db91d)
   )
-  (fp_line (start -5.485 -0.26) (end -5.485 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 2d5c3170-3e48-49a3-b92e-ce4062618633))
-  (fp_line (start -3.685 -1.71) (end -3.685 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 5b8d9cb2-fde0-450f-a103-9412799894b3))
-  (fp_line (start -5.485 -1.71) (end -3.685 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 908429ad-2824-445a-b0b2-49d7533629be))
-  (fp_line (start 5.485 -1.71) (end 3.685 -1.71) (layer "F.SilkS") (width 0.12) (tstamp c7aef495-0e24-4573-9dbc-ee4245a30302))
-  (fp_line (start -4.215 2.56) (end 4.215 2.56) (layer "F.SilkS") (width 0.12) (tstamp db1deabc-0a78-4153-a1d4-a47e9f054e34))
-  (fp_line (start 5.485 -0.26) (end 5.485 -1.71) (layer "F.SilkS") (width 0.12) (tstamp f7d554f5-edcf-498e-9d47-5da2a1554c3a))
-  (fp_line (start 5.98 3.2) (end 5.98 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 3a3db3c3-f212-49ba-88c7-7e5627242d26))
-  (fp_line (start -5.98 -3.2) (end -5.98 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 67c4318e-5471-426c-9651-e24251c44c67))
-  (fp_line (start -5.98 3.2) (end 5.98 3.2) (layer "F.CrtYd") (width 0.05) (tstamp b6db8a91-91f4-4727-aa53-74a21b8ea467))
-  (fp_line (start 5.98 -3.2) (end -5.98 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp eb8f1c40-8aa9-40ca-af45-4b14ac8a7c05))
-  (fp_line (start -5.375 2.45) (end 5.375 2.45) (layer "F.Fab") (width 0.1) (tstamp 21985dd1-fc24-4d50-bfe2-55974bd832a2))
-  (fp_line (start -5.375 -1.6) (end -5.375 2.45) (layer "F.Fab") (width 0.1) (tstamp 569771b6-730b-427d-a537-d6f51436e4b2))
-  (fp_line (start 5.375 -1.6) (end 5.375 2.45) (layer "F.Fab") (width 0.1) (tstamp 7394f1e0-53db-401d-9803-51f68d814d72))
-  (fp_line (start -5.375 -1.6) (end 5.375 -1.6) (layer "F.Fab") (width 0.1) (tstamp 91e8da8d-bc88-4f40-ba2a-ad8cade76d61))
-  (fp_line (start -3.125 -0.892893) (end -2.625 -1.6) (layer "F.Fab") (width 0.1) (tstamp b50623d0-575f-43ec-bb34-522cefc47144))
-  (fp_line (start -3.625 -1.6) (end -3.125 -0.892893) (layer "F.Fab") (width 0.1) (tstamp ff498592-6b4d-492d-b21a-70b6e8d0ab5d))
-  (pad "1" smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cbc70dbe-aac1-4831-9157-5e48a3e657c1))
-  (pad "2" smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6d4858b4-9461-4ee9-8ea6-ab9ed15a3596))
-  (pad "3" smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4d9cd413-b28c-4407-95b5-1296b18bfe20))
-  (pad "4" smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2be97a5d-59e0-47db-b9a7-16417f834cec))
-  (pad "5" smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e9613ee0-72bc-4697-9be5-5c571906f8c9))
-  (pad "6" smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 167a2ec4-a42c-494a-bbaa-6e420a5f633f))
-  (pad "MP" smd roundrect (at 4.975 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 26040a9e-64b4-457f-8478-8e73995f29eb))
-  (pad "MP" smd roundrect (at -4.975 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 474a0f0a-9ac3-4e17-a1db-d9837aae2e5a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM06B-GHS-TB_1x06-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal.kicad_mod
index cbf7f44d1..1c5672ef6 100644
--- a/Connector_JST.pretty/JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,47 +1,59 @@
-(footprint "JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM07B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ba4e3a81-b29f-4a72-b23f-348a0470fba7)
   )
-  (fp_text value "JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b7e138f8-9306-420d-aefe-d440c51501db)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -6 -1.6) (end 6 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.11 -0.26) (end -6.11 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 -1.71) (end -4.31 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.31 -1.71) (end -4.31 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 -0.26) (end 6.11 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 -1.71) (end 4.31 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.84 2.56) (end 4.84 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6 2.45) (end 6 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -1.6) (end -6 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 -1.6) (end 6 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.6 -3.2) (end -6.6 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.6 3.2) (end 6.6 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.6 3.2) (end 6.6 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.6 -3.2) (end -6.6 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.25 -1.6) (end -3.75 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -0.892893) (end -3.25 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.6 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 5.6 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0df50544-468b-4ed9-ac5b-6b478a639703)
   )
-  (fp_line (start -4.31 -1.71) (end -4.31 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 54bc9b8d-756e-4c21-a23d-779bdd0b2c1a))
-  (fp_line (start -6.11 -0.26) (end -6.11 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 959c27a6-1d12-41a3-b5a6-77f74c13cbc7))
-  (fp_line (start 6.11 -0.26) (end 6.11 -1.71) (layer "F.SilkS") (width 0.12) (tstamp a249e5ba-2ae1-480e-9139-cc70362471ec))
-  (fp_line (start -4.84 2.56) (end 4.84 2.56) (layer "F.SilkS") (width 0.12) (tstamp b008a9bc-200b-4804-8348-8841aa080f06))
-  (fp_line (start 6.11 -1.71) (end 4.31 -1.71) (layer "F.SilkS") (width 0.12) (tstamp e712e1aa-ee58-431a-86c2-b3fa9aec92c1))
-  (fp_line (start -6.11 -1.71) (end -4.31 -1.71) (layer "F.SilkS") (width 0.12) (tstamp f0b61beb-08cb-452d-a0d6-6c62f1e1e7bd))
-  (fp_line (start 6.6 -3.2) (end -6.6 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 5f5aece3-0005-4535-8366-ffdf0c000878))
-  (fp_line (start -6.6 -3.2) (end -6.6 3.2) (layer "F.CrtYd") (width 0.05) (tstamp b06660e8-43bd-4f55-92a1-a3375ea20a3d))
-  (fp_line (start -6.6 3.2) (end 6.6 3.2) (layer "F.CrtYd") (width 0.05) (tstamp ba1cec66-060b-4f66-b678-974529105676))
-  (fp_line (start 6.6 3.2) (end 6.6 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp ed6b265a-4723-42c0-b511-bcf96d5551d1))
-  (fp_line (start -4.25 -1.6) (end -3.75 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 031a8072-7e9b-43d2-98bb-b71d18e129a7))
-  (fp_line (start -6 -1.6) (end -6 2.45) (layer "F.Fab") (width 0.1) (tstamp 3484f824-be41-46ff-add1-05156ab71c93))
-  (fp_line (start 6 -1.6) (end 6 2.45) (layer "F.Fab") (width 0.1) (tstamp 3bd29ae5-ddac-4a4c-a392-95f8e3710d42))
-  (fp_line (start -3.75 -0.892893) (end -3.25 -1.6) (layer "F.Fab") (width 0.1) (tstamp 5f7e5033-77ad-4644-af13-f2369b13e15b))
-  (fp_line (start -6 -1.6) (end 6 -1.6) (layer "F.Fab") (width 0.1) (tstamp bcd532b6-40ed-45df-86f2-7ebb82286cbd))
-  (fp_line (start -6 2.45) (end 6 2.45) (layer "F.Fab") (width 0.1) (tstamp f9cfa422-9bc0-45ac-9383-1e84766f347b))
-  (pad "1" smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bac07f10-0e71-4d28-a019-a48ad5c8e7d4))
-  (pad "2" smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0370f2dd-9cc7-48e8-bada-b54675ab4ebe))
-  (pad "3" smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 737858d4-dbb0-4a6c-99a3-68e36297d3e6))
-  (pad "4" smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e669d2cc-7f98-4462-9745-ab38192ffdc9))
-  (pad "5" smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 35036d9d-0f44-4542-ba73-b31610a94565))
-  (pad "6" smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 35926cba-ee76-4e54-8082-a978ef18ec6b))
-  (pad "7" smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2705e9b8-11f7-42ca-af9e-f2222f38daff))
-  (pad "MP" smd roundrect (at -5.6 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 86f7615e-6548-427a-ba48-246c44f517fd))
-  (pad "MP" smd roundrect (at 5.6 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b4e874fd-562c-49d1-be81-892179e879b2))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM07B-GHS-TB_1x07-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal.kicad_mod
index cf890a39c..3d5d2fd0d 100644
--- a/Connector_JST.pretty/JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,48 +1,60 @@
-(footprint "JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM08B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp dec3bd66-bba2-4f4a-baa1-812b55d49e0a)
   )
-  (fp_text value "JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3de88030-7dc5-47ca-aa72-3ace0566574b)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -6.625 -1.6) (end 6.625 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.735 -0.26) (end -6.735 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.735 -1.71) (end -4.935 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.935 -1.71) (end -4.935 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.735 -0.26) (end 6.735 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.735 -1.71) (end 4.935 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.465 2.56) (end 5.465 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.625 2.45) (end 6.625 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.625 -1.6) (end -6.625 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.625 -1.6) (end 6.625 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.22 -3.2) (end -7.22 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.22 3.2) (end 7.22 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.22 3.2) (end 7.22 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.22 -3.2) (end -7.22 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.875 -1.6) (end -4.375 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.375 -0.892893) (end -3.875 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.225 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 6.225 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4902b5e2-6ec0-4d41-9e50-417ed877c27b)
   )
-  (fp_line (start 6.735 -1.71) (end 4.935 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 148eb3ee-5d06-4bc3-a7e2-99bfe890ba16))
-  (fp_line (start -5.465 2.56) (end 5.465 2.56) (layer "F.SilkS") (width 0.12) (tstamp 4e3e9dea-678c-48a8-b173-e1302dbf6698))
-  (fp_line (start -6.735 -1.71) (end -4.935 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 5f3313ff-48cd-43a2-8c43-4c328514af0a))
-  (fp_line (start -6.735 -0.26) (end -6.735 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 9275b8ac-f69c-482a-88cb-8064f5520225))
-  (fp_line (start -4.935 -1.71) (end -4.935 -2.7) (layer "F.SilkS") (width 0.12) (tstamp b3136881-b04d-4730-b295-9a3e068595f8))
-  (fp_line (start 6.735 -0.26) (end 6.735 -1.71) (layer "F.SilkS") (width 0.12) (tstamp b7b1b6e3-958c-4ef8-956a-afd32485cf4f))
-  (fp_line (start -7.22 -3.2) (end -7.22 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 9383c9d4-7ce4-4de6-aa7c-fd0c469d1d2e))
-  (fp_line (start 7.22 -3.2) (end -7.22 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp b770a2db-1350-4a35-8b89-340d46aff4c5))
-  (fp_line (start 7.22 3.2) (end 7.22 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp d69b0a2e-84d9-4d70-8cda-01793aee3dbe))
-  (fp_line (start -7.22 3.2) (end 7.22 3.2) (layer "F.CrtYd") (width 0.05) (tstamp f146b63c-a1d0-40b5-8197-c5ec074a5f2f))
-  (fp_line (start 6.625 -1.6) (end 6.625 2.45) (layer "F.Fab") (width 0.1) (tstamp 3b84682e-9230-448e-82cf-b559b6e744ee))
-  (fp_line (start -6.625 -1.6) (end 6.625 -1.6) (layer "F.Fab") (width 0.1) (tstamp 4e6af36c-b28e-49ff-98b8-d58b1d952e58))
-  (fp_line (start -4.375 -0.892893) (end -3.875 -1.6) (layer "F.Fab") (width 0.1) (tstamp cbd66c2a-b50d-494e-a26a-db88a2437afe))
-  (fp_line (start -6.625 2.45) (end 6.625 2.45) (layer "F.Fab") (width 0.1) (tstamp d3e1a6d3-8880-422a-af15-3c8bac6e4400))
-  (fp_line (start -4.875 -1.6) (end -4.375 -0.892893) (layer "F.Fab") (width 0.1) (tstamp ea9e6bf2-bcdd-40e9-8807-137cd3bf8797))
-  (fp_line (start -6.625 -1.6) (end -6.625 2.45) (layer "F.Fab") (width 0.1) (tstamp edc44fb7-d9c6-485b-b937-5f929abf0c8d))
-  (pad "1" smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ff6bee80-b3ba-4fb4-b119-5e8aff311fb8))
-  (pad "2" smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0a79cd11-64d0-4eba-afed-125e3e585b47))
-  (pad "3" smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1103bb15-693c-4a40-b471-95f25ccaf8f5))
-  (pad "4" smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fc6624aa-e120-4947-b5d5-f165049e5e26))
-  (pad "5" smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 96c4616a-2648-4496-8535-0ec3261ced4e))
-  (pad "6" smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3a9adc18-cffe-4abc-a302-2e9a21b998f9))
-  (pad "7" smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5ab3278b-9d34-46b4-a084-b6be34ab9732))
-  (pad "8" smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 20006e57-4725-41f6-94c1-a028e3d758ae))
-  (pad "MP" smd roundrect (at 6.225 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 752c9c5a-ae10-45e6-92d2-9d438eda98c1))
-  (pad "MP" smd roundrect (at -6.225 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e4830917-c8b7-4668-b1f4-b433bbeca2eb))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM08B-GHS-TB_1x08-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal.kicad_mod
index d0dc6c2e7..cd40b2ccf 100644
--- a/Connector_JST.pretty/JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,49 +1,61 @@
-(footprint "JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM09B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2cd9ab7f-4931-4f70-9541-2fc78d8f8ccd)
   )
-  (fp_text value "JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9b4ff4a2-3126-46b3-9910-9eb110a50c09)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7.25 -1.6) (end 7.25 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.36 -0.26) (end -7.36 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.36 -1.71) (end -5.56 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.56 -1.71) (end -5.56 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.36 -0.26) (end 7.36 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.36 -1.71) (end 5.56 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.09 2.56) (end 6.09 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.25 2.45) (end 7.25 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -1.6) (end -7.25 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -1.6) (end 7.25 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.85 -3.2) (end -7.85 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.85 3.2) (end 7.85 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.85 3.2) (end 7.85 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.85 -3.2) (end -7.85 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 -1.6) (end -5 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.892893) (end -4.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.85 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 6.85 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c412a4a1-68b6-4b12-bfd0-6bfb9b2471df)
   )
-  (fp_line (start -6.09 2.56) (end 6.09 2.56) (layer "F.SilkS") (width 0.12) (tstamp 01f568f8-d48d-484d-bff2-40b5ebaaa004))
-  (fp_line (start -7.36 -0.26) (end -7.36 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 39614dcd-7e93-4130-9dde-20ce023add09))
-  (fp_line (start -5.56 -1.71) (end -5.56 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 4956cd5e-dbff-408c-a115-bc0a7c1468db))
-  (fp_line (start -7.36 -1.71) (end -5.56 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 527cf229-b39d-477d-b792-8d498ec19014))
-  (fp_line (start 7.36 -0.26) (end 7.36 -1.71) (layer "F.SilkS") (width 0.12) (tstamp ea85afc9-a882-4451-981d-c70b7ce522f7))
-  (fp_line (start 7.36 -1.71) (end 5.56 -1.71) (layer "F.SilkS") (width 0.12) (tstamp fee471f6-0c3a-4eab-a33a-d4964cf0be05))
-  (fp_line (start 7.85 3.2) (end 7.85 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 18849bf9-b2a9-4434-8e07-b3b3ec8b1092))
-  (fp_line (start 7.85 -3.2) (end -7.85 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 358be59f-13e3-4907-8e16-92c140ee2799))
-  (fp_line (start -7.85 3.2) (end 7.85 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 97dd591a-34e7-44c3-be39-c03bd7695f41))
-  (fp_line (start -7.85 -3.2) (end -7.85 3.2) (layer "F.CrtYd") (width 0.05) (tstamp f4d087a1-4ea1-44ba-811d-fe0c8b86790b))
-  (fp_line (start -7.25 -1.6) (end 7.25 -1.6) (layer "F.Fab") (width 0.1) (tstamp 178250e2-c447-437e-a4cd-e5bc49a27a56))
-  (fp_line (start -5.5 -1.6) (end -5 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 469498d2-c738-405f-9272-173954736627))
-  (fp_line (start -7.25 2.45) (end 7.25 2.45) (layer "F.Fab") (width 0.1) (tstamp 550eeae1-51f2-48b9-8951-e75fd8029b69))
-  (fp_line (start 7.25 -1.6) (end 7.25 2.45) (layer "F.Fab") (width 0.1) (tstamp 670fd938-ebde-4cd7-a66b-1fa1627ceaa0))
-  (fp_line (start -5 -0.892893) (end -4.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 8250a9d8-ff63-49f7-8b33-40d205a71783))
-  (fp_line (start -7.25 -1.6) (end -7.25 2.45) (layer "F.Fab") (width 0.1) (tstamp e9010333-78bf-4d00-aba1-88e4b6ef4abb))
-  (pad "1" smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 937acf46-a6c5-4a5f-8f40-73a0d5c96b73))
-  (pad "2" smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 62f23969-1c01-47ad-a09c-152da179d920))
-  (pad "3" smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 339b0a76-4603-4ce6-9862-a2b2d9eadade))
-  (pad "4" smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aef140a6-2cf3-42f0-a6e1-c13ea8daa970))
-  (pad "5" smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 81b66e57-9863-47f0-b951-0b76fc51b639))
-  (pad "6" smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97369df1-a9f6-4e0e-8e56-b1e31561e79e))
-  (pad "7" smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7ef384b3-c4b4-4d29-8325-ff8d225e0594))
-  (pad "8" smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4f2ea538-0731-4c64-a599-1cc5924db929))
-  (pad "9" smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dc7f6f31-29cc-4f73-a0d2-e782283f417a))
-  (pad "MP" smd roundrect (at -6.85 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 53a5e195-500a-47cb-8c7a-8b4dcc0d6992))
-  (pad "MP" smd roundrect (at 6.85 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c9b9fa95-66cc-4a66-9624-cf37e3a55623))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM09B-GHS-TB_1x09-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal.kicad_mod
index 5925956ea..600ac8541 100644
--- a/Connector_JST.pretty/JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,50 +1,62 @@
-(footprint "JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM10B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1fea0420-b790-4d10-a2ea-54afb3999d9b)
   )
-  (fp_text value "JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 971c904a-6d7a-4226-babf-d78028ff54b1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7.875 -1.6) (end 7.875 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.985 -0.26) (end -7.985 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.985 -1.71) (end -6.185 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.185 -1.71) (end -6.185 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.985 -0.26) (end 7.985 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.985 -1.71) (end 6.185 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.715 2.56) (end 6.715 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.875 2.45) (end 7.875 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.875 -1.6) (end -7.875 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.875 -1.6) (end 7.875 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.48 -3.2) (end -8.48 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.48 3.2) (end 8.48 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.48 3.2) (end 8.48 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.48 -3.2) (end -8.48 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.125 -1.6) (end -5.625 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.625 -0.892893) (end -5.125 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.475 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 7.475 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e47605e3-23d3-4b76-b513-0020432f8977)
   )
-  (fp_line (start -7.985 -1.71) (end -6.185 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 36a5ca66-dcf8-47dd-bf2a-5d536470eb09))
-  (fp_line (start 7.985 -0.26) (end 7.985 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 3a5b3b5e-ce60-493f-a433-82ef5edc23a4))
-  (fp_line (start 7.985 -1.71) (end 6.185 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 6eb1f194-2afb-4fb7-93e1-a7a3eec93c0d))
-  (fp_line (start -6.715 2.56) (end 6.715 2.56) (layer "F.SilkS") (width 0.12) (tstamp 77bf210a-6f4e-4627-8e5c-a698fad7e521))
-  (fp_line (start -6.185 -1.71) (end -6.185 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 8c209671-d3ec-41ed-a4bc-86d950ebe06f))
-  (fp_line (start -7.985 -0.26) (end -7.985 -1.71) (layer "F.SilkS") (width 0.12) (tstamp d64e625b-5d99-4dc9-bc1a-d30f5c90cef9))
-  (fp_line (start -8.48 -3.2) (end -8.48 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 496cddc5-0930-450d-ae53-61c3c997ecbd))
-  (fp_line (start -8.48 3.2) (end 8.48 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 62e6d9a7-5907-4914-93b1-2cdc7b66c43b))
-  (fp_line (start 8.48 -3.2) (end -8.48 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 6fd2c400-54ef-4857-ae1a-a959c49e7ced))
-  (fp_line (start 8.48 3.2) (end 8.48 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp ff645564-6126-4f44-b0d2-759fb4cb76ac))
-  (fp_line (start -7.875 -1.6) (end 7.875 -1.6) (layer "F.Fab") (width 0.1) (tstamp 16212853-1d75-4a23-a16b-4755af57966f))
-  (fp_line (start -7.875 -1.6) (end -7.875 2.45) (layer "F.Fab") (width 0.1) (tstamp 4cbd456f-d5e1-467c-8c11-3c9a5ea024e5))
-  (fp_line (start 7.875 -1.6) (end 7.875 2.45) (layer "F.Fab") (width 0.1) (tstamp 7c9438d8-fbbd-4275-8fca-fb69a8fa1626))
-  (fp_line (start -7.875 2.45) (end 7.875 2.45) (layer "F.Fab") (width 0.1) (tstamp 8d044377-c3d0-450b-8d50-ce6ac1fbbfbe))
-  (fp_line (start -5.625 -0.892893) (end -5.125 -1.6) (layer "F.Fab") (width 0.1) (tstamp 8f1a190f-aab1-451d-b8a3-95b27a81c367))
-  (fp_line (start -6.125 -1.6) (end -5.625 -0.892893) (layer "F.Fab") (width 0.1) (tstamp f4604dd5-d6ed-4453-805a-dd6d9d9a7a88))
-  (pad "1" smd roundrect (at -5.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ce8b59d1-a34f-47a4-80d9-f6f70d2326d6))
-  (pad "2" smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a103ed24-e8d2-4bab-b049-a657576d2dbf))
-  (pad "3" smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 607b6f62-d892-4235-aad2-7378126fafb2))
-  (pad "4" smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 50e603b8-e2cd-4a41-a028-9f40c441ced0))
-  (pad "5" smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 26471858-a31a-49df-9a2e-2900ed0e38bb))
-  (pad "6" smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 34032a75-d1a2-4d42-850b-90b5474e8af6))
-  (pad "7" smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 113d0775-8308-44ae-a0c0-90628194202b))
-  (pad "8" smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 63fa652d-58e1-43e1-ae1f-ea0815a8db5a))
-  (pad "9" smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b2affda8-753b-4ef8-ae38-ef1878582348))
-  (pad "10" smd roundrect (at 5.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 88b9b56d-f0f1-4b57-98c0-22397c2ba426))
-  (pad "MP" smd roundrect (at 7.475 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 27d50f0d-0791-4edd-b069-c97a4fcf04e0))
-  (pad "MP" smd roundrect (at -7.475 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 533c21b9-27a0-448d-b2aa-6a6638895d76))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM10B-GHS-TB_1x10-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal.kicad_mod
index ff78f1b41..0b28645d0 100644
--- a/Connector_JST.pretty/JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,51 +1,63 @@
-(footprint "JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM11B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp bcb481ce-66d2-4d38-aae9-2d0d4e908e2a)
   )
-  (fp_text value "JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e0c9cc20-7d1a-4d94-a5ef-b04b729b5ed1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -8.5 -1.6) (end 8.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.61 -0.26) (end -8.61 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.61 -1.71) (end -6.81 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.81 -1.71) (end -6.81 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 -0.26) (end 8.61 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 -1.71) (end 6.81 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.34 2.56) (end 7.34 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.5 2.45) (end 8.5 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -1.6) (end -8.5 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 -1.6) (end 8.5 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.1 -3.2) (end -9.1 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.1 3.2) (end 9.1 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.1 3.2) (end 9.1 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.1 -3.2) (end -9.1 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.75 -1.6) (end -6.25 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -0.892893) (end -5.75 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.1 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 8.1 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7e0aa614-7740-4966-b532-d30a9ab89476)
   )
-  (fp_line (start -7.34 2.56) (end 7.34 2.56) (layer "F.SilkS") (width 0.12) (tstamp 4ac20ae2-374c-49fd-9f0e-cb7c9450247e))
-  (fp_line (start 8.61 -1.71) (end 6.81 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 5416b9ae-5cc9-49a7-83da-e4adf8349da8))
-  (fp_line (start -8.61 -1.71) (end -6.81 -1.71) (layer "F.SilkS") (width 0.12) (tstamp aa8f039e-9a2f-40a6-9569-623344a3b0c7))
-  (fp_line (start 8.61 -0.26) (end 8.61 -1.71) (layer "F.SilkS") (width 0.12) (tstamp ada09e34-1cbf-4374-a0f5-24675b1d6bd7))
-  (fp_line (start -6.81 -1.71) (end -6.81 -2.7) (layer "F.SilkS") (width 0.12) (tstamp d3860c03-5628-4342-954b-566bd8367e7b))
-  (fp_line (start -8.61 -0.26) (end -8.61 -1.71) (layer "F.SilkS") (width 0.12) (tstamp d9850f41-8779-4c9c-97ae-7f29c5e3d871))
-  (fp_line (start -9.1 -3.2) (end -9.1 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 4149cc8b-e9d6-4704-965a-bb587abc01f4))
-  (fp_line (start -9.1 3.2) (end 9.1 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 5f098c73-d932-4987-b41c-6df1a1808da4))
-  (fp_line (start 9.1 3.2) (end 9.1 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 759ab102-9f6e-45ff-9f4e-82f81e1ffb78))
-  (fp_line (start 9.1 -3.2) (end -9.1 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp e026df0f-b594-4950-a91b-60717988e3c7))
-  (fp_line (start -8.5 -1.6) (end -8.5 2.45) (layer "F.Fab") (width 0.1) (tstamp 1840bffe-722b-4e48-a47c-1441b02a8282))
-  (fp_line (start -8.5 -1.6) (end 8.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 2cca1bd2-5283-403f-857c-35b67201bf21))
-  (fp_line (start -6.75 -1.6) (end -6.25 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 3cc50f35-e51d-4d68-ac4a-0887e7950315))
-  (fp_line (start -8.5 2.45) (end 8.5 2.45) (layer "F.Fab") (width 0.1) (tstamp 759dc956-b86c-4415-910a-258e732ac5f6))
-  (fp_line (start -6.25 -0.892893) (end -5.75 -1.6) (layer "F.Fab") (width 0.1) (tstamp a7c8a5e7-aa7e-47b1-bd31-2ffb417490d5))
-  (fp_line (start 8.5 -1.6) (end 8.5 2.45) (layer "F.Fab") (width 0.1) (tstamp fbd74e26-44c1-4e9d-b59d-18a76ea12202))
-  (pad "1" smd roundrect (at -6.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 25a1f922-8824-4882-bf7e-3a483a4a6a28))
-  (pad "2" smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 24ad7664-ba50-42c9-a96b-68dc3d912a4c))
-  (pad "3" smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cfd203b4-6bda-4d89-9303-64c062ab4f9b))
-  (pad "4" smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 305c93b6-ba66-4c3d-86cd-6ef318380614))
-  (pad "5" smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c72092c3-9beb-4437-9927-89a517f01d75))
-  (pad "6" smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9a41cbc8-6860-45a6-9d60-6ce6a72bfde0))
-  (pad "7" smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3e483832-5a1f-4be2-ac97-d33a33d2db7d))
-  (pad "8" smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 90294f3d-b1e1-438f-8a9c-eb16f0f21ec9))
-  (pad "9" smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9969d98f-c33f-4ab2-88a0-0551203712ca))
-  (pad "10" smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1d523093-7431-46e1-89eb-50e444ab87b7))
-  (pad "11" smd roundrect (at 6.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 03505fbd-0528-4dd4-b362-46ee4c41d379))
-  (pad "MP" smd roundrect (at -8.1 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7cfae9c3-d224-4563-8f58-52760fe946e7))
-  (pad "MP" smd roundrect (at 8.1 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9dd0badb-f534-4b56-a276-e77730cf7097))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM11B-GHS-TB_1x11-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal.kicad_mod
index 310191a33..d0e2b723d 100644
--- a/Connector_JST.pretty/JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,52 +1,64 @@
-(footprint "JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM12B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9982b852-68cd-4e0c-a94c-a26057940a12)
   )
-  (fp_text value "JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c7e4f1aa-d3ac-4944-bdc6-883f059a4ff2)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -9.125 -1.6) (end 9.125 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.235 -0.26) (end -9.235 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.235 -1.71) (end -7.435 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.435 -1.71) (end -7.435 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.235 -0.26) (end 9.235 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.235 -1.71) (end 7.435 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.965 2.56) (end 7.965 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.125 2.45) (end 9.125 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.125 -1.6) (end -9.125 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.125 -1.6) (end 9.125 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.72 -3.2) (end -9.72 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.72 3.2) (end 9.72 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.72 3.2) (end 9.72 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.72 -3.2) (end -9.72 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.375 -1.6) (end -6.875 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.875 -0.892893) (end -6.375 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.725 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 8.725 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6aaab162-4767-4df8-be60-f7a623dea72c)
   )
-  (fp_line (start -7.435 -1.71) (end -7.435 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 39326e72-6b05-420a-9bee-79206e348fca))
-  (fp_line (start -9.235 -0.26) (end -9.235 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 5d5c1da2-1ce0-43e6-ac41-9b690e2db7c0))
-  (fp_line (start -7.965 2.56) (end 7.965 2.56) (layer "F.SilkS") (width 0.12) (tstamp 620573f4-0ac0-44b3-9f60-7518be9e8604))
-  (fp_line (start 9.235 -1.71) (end 7.435 -1.71) (layer "F.SilkS") (width 0.12) (tstamp ad0a8f45-7586-4471-a10c-00c25c60fbba))
-  (fp_line (start 9.235 -0.26) (end 9.235 -1.71) (layer "F.SilkS") (width 0.12) (tstamp f09bf20f-398a-4705-8e94-52e225093b39))
-  (fp_line (start -9.235 -1.71) (end -7.435 -1.71) (layer "F.SilkS") (width 0.12) (tstamp fd749805-2061-430e-8eed-2e1edf065dcb))
-  (fp_line (start -9.72 3.2) (end 9.72 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 22266810-8384-4ec9-8780-4936dae598d7))
-  (fp_line (start 9.72 3.2) (end 9.72 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 44d3c41b-c5e0-4698-9c06-98b3ec36ae97))
-  (fp_line (start 9.72 -3.2) (end -9.72 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp c71f2eec-0eb2-4ab0-bccd-f3ea7a8e480f))
-  (fp_line (start -9.72 -3.2) (end -9.72 3.2) (layer "F.CrtYd") (width 0.05) (tstamp f0588a2c-6f25-4f2b-8053-44e7de5f93a2))
-  (fp_line (start -6.875 -0.892893) (end -6.375 -1.6) (layer "F.Fab") (width 0.1) (tstamp 353c6619-1046-4305-86d9-46e3942828e4))
-  (fp_line (start 9.125 -1.6) (end 9.125 2.45) (layer "F.Fab") (width 0.1) (tstamp 5e541110-b83d-4cf3-822c-022713145af1))
-  (fp_line (start -9.125 -1.6) (end -9.125 2.45) (layer "F.Fab") (width 0.1) (tstamp b0451cb5-4ddc-429a-8fcc-f7f567b8def1))
-  (fp_line (start -9.125 2.45) (end 9.125 2.45) (layer "F.Fab") (width 0.1) (tstamp d7bc3893-f5f1-4f23-8e24-814f357a14cf))
-  (fp_line (start -9.125 -1.6) (end 9.125 -1.6) (layer "F.Fab") (width 0.1) (tstamp d8025194-91a4-45cc-8c09-ef382e1e1afd))
-  (fp_line (start -7.375 -1.6) (end -6.875 -0.892893) (layer "F.Fab") (width 0.1) (tstamp eebb06da-f466-42b8-9205-5dc61767acca))
-  (pad "1" smd roundrect (at -6.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 961538e9-73c2-4053-be5b-02c3cf379367))
-  (pad "2" smd roundrect (at -5.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9ac348d2-d37a-4d1c-84c5-e9864ebbb53f))
-  (pad "3" smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b82b218f-54cd-4b00-bcc8-e5d39893efd3))
-  (pad "4" smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f28e5e5f-aa9f-4590-9c90-e03da1d0d9b8))
-  (pad "5" smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 63cdc66a-17fb-4d68-9944-fa87142268b7))
-  (pad "6" smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6e5810f2-2c17-47e1-b9c9-05f065aa0d5f))
-  (pad "7" smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6b01fde8-7857-429f-aebb-9f4c4c343a93))
-  (pad "8" smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c3fefb8-7607-453f-8385-0437832ff659))
-  (pad "9" smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1893675d-bd93-4ae3-9b57-05cb2492287e))
-  (pad "10" smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dd59eb93-d010-40d0-87b7-883fcaa8692b))
-  (pad "11" smd roundrect (at 5.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6f870c1f-e45b-4c19-ada3-2d89e88c07cc))
-  (pad "12" smd roundrect (at 6.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7595d0bd-a41d-433f-9aa3-f87cf1b57818))
-  (pad "MP" smd roundrect (at -8.725 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6711d296-3d58-4506-ac64-58485e2bb61a))
-  (pad "MP" smd roundrect (at 8.725 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp db1c174a-f00d-4f07-b717-d797a3c69cce))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM12B-GHS-TB_1x12-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal.kicad_mod
index 2f8122758..eae097833 100644
--- a/Connector_JST.pretty/JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,53 +1,65 @@
-(footprint "JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM13B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b628784a-4e27-490d-99ec-48b235fade06)
   )
-  (fp_text value "JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 58dbb5f9-6750-458f-a1e0-dba8124dd824)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -9.75 -1.6) (end 9.75 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.86 -0.26) (end -9.86 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.86 -1.71) (end -8.06 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.06 -1.71) (end -8.06 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 -0.26) (end 9.86 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 -1.71) (end 8.06 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.59 2.56) (end 8.59 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.75 2.45) (end 9.75 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -1.6) (end -9.75 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -1.6) (end 9.75 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.35 -3.2) (end -10.35 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.35 3.2) (end 10.35 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.35 3.2) (end 10.35 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.35 -3.2) (end -10.35 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8 -1.6) (end -7.5 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 -0.892893) (end -7 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 7.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.35 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 9.35 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 82a7450e-5f73-4cf0-8d2b-482fd415f884)
   )
-  (fp_line (start 9.86 -0.26) (end 9.86 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 0d86717e-b741-46e7-b2ce-e89a4eda523a))
-  (fp_line (start -9.86 -1.71) (end -8.06 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 1788ddee-3bee-4f3b-b3dc-2849b0f637c8))
-  (fp_line (start -9.86 -0.26) (end -9.86 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 30828958-4e4a-4663-8a44-7409bce2cbfc))
-  (fp_line (start -8.06 -1.71) (end -8.06 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 5b950cfd-5de4-498d-8b83-970d80504b77))
-  (fp_line (start -8.59 2.56) (end 8.59 2.56) (layer "F.SilkS") (width 0.12) (tstamp 8e58e938-f0ed-4078-985a-1792d6106fb5))
-  (fp_line (start 9.86 -1.71) (end 8.06 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 9584ece3-f26d-4764-9399-ab432fb57233))
-  (fp_line (start -10.35 3.2) (end 10.35 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 88ea8f97-fd36-4807-94fe-0d95905c3e7f))
-  (fp_line (start 10.35 -3.2) (end -10.35 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 950a77fd-5347-44ac-a0a9-8f1a4d4cb52e))
-  (fp_line (start 10.35 3.2) (end 10.35 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp cbc80f6d-0b47-4620-9b58-9a6c00aef9af))
-  (fp_line (start -10.35 -3.2) (end -10.35 3.2) (layer "F.CrtYd") (width 0.05) (tstamp d8f88df5-b2ce-409f-b437-2c4ac3bd656d))
-  (fp_line (start -9.75 -1.6) (end 9.75 -1.6) (layer "F.Fab") (width 0.1) (tstamp 1301d4a0-f439-40c8-b13b-c89beca170ce))
-  (fp_line (start -8 -1.6) (end -7.5 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 2dde6f53-b474-4df6-8348-6c3a4e161c18))
-  (fp_line (start 9.75 -1.6) (end 9.75 2.45) (layer "F.Fab") (width 0.1) (tstamp 81b3a2b4-f95c-4ab0-8399-32e89078ebe9))
-  (fp_line (start -9.75 2.45) (end 9.75 2.45) (layer "F.Fab") (width 0.1) (tstamp 984246d0-424f-4d7e-97d9-dfb655987804))
-  (fp_line (start -9.75 -1.6) (end -9.75 2.45) (layer "F.Fab") (width 0.1) (tstamp a91dec39-ff58-482a-b5d3-69b3620bd9d6))
-  (fp_line (start -7.5 -0.892893) (end -7 -1.6) (layer "F.Fab") (width 0.1) (tstamp b62c2221-7d66-45f1-915a-b47579ec96a2))
-  (pad "1" smd roundrect (at -7.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7f8a51c3-f1d2-46b5-a6b6-223d13f786cb))
-  (pad "2" smd roundrect (at -6.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8b3670b1-c24d-4c88-a467-4e02fcca117e))
-  (pad "3" smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b029ba1e-9111-49c7-aa3f-d3b803ab4898))
-  (pad "4" smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 334fe09d-1c9d-4003-a773-87a6dcf0f569))
-  (pad "5" smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 38726c39-0955-49f1-a3cc-ef42ba18fdae))
-  (pad "6" smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 277bd6c3-9301-4dc7-8abb-bd19cf3685db))
-  (pad "7" smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 07b3a012-be68-49ce-b188-9fb4ae21731a))
-  (pad "8" smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 23eef3b9-5522-473b-a9aa-a78708a2de5c))
-  (pad "9" smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 83f4f05f-3791-475b-86cc-9042e673ac54))
-  (pad "10" smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 238f7121-2081-4e2f-b83b-d1e4cffe3772))
-  (pad "11" smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc69bd80-d85c-4667-9dd3-4e53b83c3d59))
-  (pad "12" smd roundrect (at 6.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8d231785-2697-4f80-bfe7-a493656176cb))
-  (pad "13" smd roundrect (at 7.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 497350b9-1f48-432b-a86d-a98493ee08b9))
-  (pad "MP" smd roundrect (at 9.35 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 59675495-7818-460e-ab60-5554d269b44c))
-  (pad "MP" smd roundrect (at -9.35 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c1ec0cc-ac1a-4516-ac8b-0d178bfaf6d3))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM13B-GHS-TB_1x13-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal.kicad_mod
index 12dfcb3df..aa26270f5 100644
--- a/Connector_JST.pretty/JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,54 +1,66 @@
-(footprint "JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM14B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3ab8e26e-792a-46ea-baa9-12401f915e6d)
   )
-  (fp_text value "JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e8251957-2d9b-4d8f-bffc-bb5d96db5d2c)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -10.375 -1.6) (end 10.375 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.485 -0.26) (end -10.485 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.485 -1.71) (end -8.685 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.685 -1.71) (end -8.685 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.485 -0.26) (end 10.485 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.485 -1.71) (end 8.685 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.215 2.56) (end 9.215 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.375 2.45) (end 10.375 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.375 -1.6) (end -10.375 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.375 -1.6) (end 10.375 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.98 -3.2) (end -10.98 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.98 3.2) (end 10.98 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.98 3.2) (end 10.98 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.98 -3.2) (end -10.98 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.625 -1.6) (end -8.125 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.125 -0.892893) (end -7.625 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5.625 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6.875 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 8.125 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.975 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 9.975 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b9d5314b-7269-4b07-a302-f5565c01de58)
   )
-  (fp_line (start -10.485 -0.26) (end -10.485 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 00daf13f-6d79-47cb-8142-1f20502ac4a9))
-  (fp_line (start 10.485 -0.26) (end 10.485 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 02d00135-4f4c-4934-87b1-f8dc62eefc6b))
-  (fp_line (start -8.685 -1.71) (end -8.685 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 04cd691f-3ef6-4c7a-b16e-47369bce8122))
-  (fp_line (start -9.215 2.56) (end 9.215 2.56) (layer "F.SilkS") (width 0.12) (tstamp 9aa30bd4-6f2f-4bc5-99b6-af46d9c617fe))
-  (fp_line (start -10.485 -1.71) (end -8.685 -1.71) (layer "F.SilkS") (width 0.12) (tstamp ab7bfe05-6711-4f95-a82a-d73d1e4acb99))
-  (fp_line (start 10.485 -1.71) (end 8.685 -1.71) (layer "F.SilkS") (width 0.12) (tstamp d4b3c3b0-a7c8-459b-aa5f-bd6fd0c9bfd3))
-  (fp_line (start 10.98 3.2) (end 10.98 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 061d3324-a7cd-4426-a473-c675610dffca))
-  (fp_line (start -10.98 -3.2) (end -10.98 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 281103f3-c3d6-455d-b1ba-2124ecb3c910))
-  (fp_line (start -10.98 3.2) (end 10.98 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 2d4b2a16-71f6-4378-a6ef-2d3702502a4c))
-  (fp_line (start 10.98 -3.2) (end -10.98 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp 4768e5d4-8d80-4be7-a842-0c126ae1b47f))
-  (fp_line (start -10.375 -1.6) (end -10.375 2.45) (layer "F.Fab") (width 0.1) (tstamp 10dd5e1c-2b48-4270-8b0e-d10154a4cd90))
-  (fp_line (start -8.625 -1.6) (end -8.125 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 3df69b12-4d42-44df-848d-e680ec392fed))
-  (fp_line (start -10.375 2.45) (end 10.375 2.45) (layer "F.Fab") (width 0.1) (tstamp 4c271dbc-ef85-4203-b0ff-bad68787fb9c))
-  (fp_line (start 10.375 -1.6) (end 10.375 2.45) (layer "F.Fab") (width 0.1) (tstamp 79479de6-fd0e-4ee5-a678-594a12855dd5))
-  (fp_line (start -10.375 -1.6) (end 10.375 -1.6) (layer "F.Fab") (width 0.1) (tstamp a8f72262-62dd-403f-9ecb-49f656a37e2f))
-  (fp_line (start -8.125 -0.892893) (end -7.625 -1.6) (layer "F.Fab") (width 0.1) (tstamp d78d30ca-d41a-4f58-ab40-103064931946))
-  (pad "1" smd roundrect (at -8.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 49483811-302b-4134-b0c0-0539c1d82e65))
-  (pad "2" smd roundrect (at -6.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bd6be615-5d36-429d-bec4-59c7b8861f51))
-  (pad "3" smd roundrect (at -5.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99df623b-eec5-4a75-9cd9-73fbc4c62531))
-  (pad "4" smd roundrect (at -4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 420570cc-c5b9-4f1e-b3b7-41edfb461b51))
-  (pad "5" smd roundrect (at -3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8a0f1ddf-e8e4-4ed7-af62-6de5831d7ab1))
-  (pad "6" smd roundrect (at -1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b85e8915-6265-4b31-849c-a494f1b2b476))
-  (pad "7" smd roundrect (at -0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f916737d-8dc2-4d80-ad4e-7fbc0526faec))
-  (pad "8" smd roundrect (at 0.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 60f85e18-daa4-4b22-af44-eb0c2e4f998d))
-  (pad "9" smd roundrect (at 1.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 62e637ed-8e6a-4e5a-b177-a663972092ad))
-  (pad "10" smd roundrect (at 3.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0a98a171-2693-403c-9744-9f07ee10ed2a))
-  (pad "11" smd roundrect (at 4.375 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e717521b-1991-4270-86f4-7fbfe2583a15))
-  (pad "12" smd roundrect (at 5.625 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9aabec30-6573-45f8-9ce0-d94ef47e74f3))
-  (pad "13" smd roundrect (at 6.875 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp efd4e9cc-b27e-4ab5-bb2a-f55745b8d7d0))
-  (pad "14" smd roundrect (at 8.125 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8d90145a-6faf-4b84-8824-79634344765e))
-  (pad "MP" smd roundrect (at 9.975 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0ea0c8a2-0159-4655-a9b9-23361f1da149))
-  (pad "MP" smd roundrect (at -9.975 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1fc66e05-8414-4674-9991-f5a6395371dd))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM14B-GHS-TB_1x14-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal.kicad_mod
index 43024122f..9ba0fd73d 100644
--- a/Connector_JST.pretty/JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal.kicad_mod
@@ -1,55 +1,67 @@
-(footprint "JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST GH series connector, SM15B-GHS-TB (http://www.jst-mfg.com/product/pdf/eng/eGH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST GH top entry")
+  (tags "connector JST GH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.9) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 16064655-0aae-4f0b-bc33-14d98ea392bb)
   )
-  (fp_text value "JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal" (at 0 3.9) (layer "F.Fab")
+  (fp_text value JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal (at 0 3.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 51f9687f-8ffb-48b4-b319-4f66f02fb53a)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -11 -1.6) (end 11 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.11 -0.26) (end -11.11 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.11 -1.71) (end -9.31 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.31 -1.71) (end -9.31 -2.7)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.11 -0.26) (end 11.11 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.11 -1.71) (end 9.31 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.84 2.56) (end 9.84 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11 2.45) (end 11 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11 -1.6) (end -11 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11 -1.6) (end 11 2.45)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.6 -3.2) (end -11.6 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.6 3.2) (end 11.6 3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.6 3.2) (end 11.6 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.6 -3.2) (end -11.6 -3.2)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.25 -1.6) (end -8.75 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -0.892893) (end -8.25 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -7.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6.25 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 7.5 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 8.75 -1.85) (size 0.6 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.6 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 10.6 1.35) (size 1 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b400ab22-4307-4d85-9ba8-1e094307e3eb)
   )
-  (fp_line (start -9.84 2.56) (end 9.84 2.56) (layer "F.SilkS") (width 0.12) (tstamp 23e9e872-044f-488e-a6e8-28372f0e759b))
-  (fp_line (start -9.31 -1.71) (end -9.31 -2.7) (layer "F.SilkS") (width 0.12) (tstamp 2959440b-514e-44fc-9633-1cdfc184d5c5))
-  (fp_line (start -11.11 -1.71) (end -9.31 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 3d105850-d288-4c83-9658-7afcae052260))
-  (fp_line (start 11.11 -1.71) (end 9.31 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 909153f3-a54d-421f-b89f-59a6b8a980f7))
-  (fp_line (start -11.11 -0.26) (end -11.11 -1.71) (layer "F.SilkS") (width 0.12) (tstamp bc3b9b6b-2ca0-4e90-8248-65dbe4162e70))
-  (fp_line (start 11.11 -0.26) (end 11.11 -1.71) (layer "F.SilkS") (width 0.12) (tstamp fae6dc76-5733-4dad-b78b-ced844cfb453))
-  (fp_line (start -11.6 3.2) (end 11.6 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 3f1a74f6-26d4-4b0a-8a8f-9708b2bd2332))
-  (fp_line (start -11.6 -3.2) (end -11.6 3.2) (layer "F.CrtYd") (width 0.05) (tstamp 8ca385ea-2704-486e-bad4-e2f41aaaa231))
-  (fp_line (start 11.6 -3.2) (end -11.6 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp b8dd9e75-dfbb-46cf-bb6b-4e7b5c57d1a6))
-  (fp_line (start 11.6 3.2) (end 11.6 -3.2) (layer "F.CrtYd") (width 0.05) (tstamp d0f65192-ea26-48be-9b05-64a7b8eafd01))
-  (fp_line (start 11 -1.6) (end 11 2.45) (layer "F.Fab") (width 0.1) (tstamp 22c4f8ed-f527-4e24-a02d-d016b834f7d6))
-  (fp_line (start -11 -1.6) (end 11 -1.6) (layer "F.Fab") (width 0.1) (tstamp 64b77232-dbf9-45ba-a44e-e46a6e475b04))
-  (fp_line (start -11 -1.6) (end -11 2.45) (layer "F.Fab") (width 0.1) (tstamp 8027d051-c666-4b40-af36-92d2de65921c))
-  (fp_line (start -11 2.45) (end 11 2.45) (layer "F.Fab") (width 0.1) (tstamp 8356aef3-3f36-43b3-a911-baee61272633))
-  (fp_line (start -9.25 -1.6) (end -8.75 -0.892893) (layer "F.Fab") (width 0.1) (tstamp ca058036-6d1f-48e8-9b77-6e8cd4b12570))
-  (fp_line (start -8.75 -0.892893) (end -8.25 -1.6) (layer "F.Fab") (width 0.1) (tstamp dc02e461-7c22-47fc-a6e9-a93b5f577161))
-  (pad "1" smd roundrect (at -8.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8761487d-dc13-4f4a-aa35-2a401a4269a8))
-  (pad "2" smd roundrect (at -7.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2b2d22fc-4893-4eba-bc38-de1ade2d9d76))
-  (pad "3" smd roundrect (at -6.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 435839a9-ee3d-47ab-a519-8da341dc80f3))
-  (pad "4" smd roundrect (at -5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1109f404-9802-4868-aba3-7cc4224b7129))
-  (pad "5" smd roundrect (at -3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a6649cf0-fe96-4c94-ae4a-34d735a8038c))
-  (pad "6" smd roundrect (at -2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2847220e-4312-460b-bf02-17b8a8e9fd99))
-  (pad "7" smd roundrect (at -1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 89322d91-4dbe-4b8e-b102-40b92391bf40))
-  (pad "8" smd roundrect (at 0 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 913d6e85-f7bb-48a6-82a9-ade941c62295))
-  (pad "9" smd roundrect (at 1.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a05d5dbc-f109-4a94-a446-0727d3984690))
-  (pad "10" smd roundrect (at 2.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9ab181ee-2b9e-45f8-94b2-2b965785174e))
-  (pad "11" smd roundrect (at 3.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 37b18868-6286-481b-bc5b-2d7381faf281))
-  (pad "12" smd roundrect (at 5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bff8b333-0fd5-4b6d-9e11-a3886da6b836))
-  (pad "13" smd roundrect (at 6.25 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 55d5ca5e-d51c-4894-8dc3-4ffc362aca33))
-  (pad "14" smd roundrect (at 7.5 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f34aa22-6325-4f64-82c9-7d95e469ab7d))
-  (pad "15" smd roundrect (at 8.75 -1.85) (size 0.6 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 934d788a-211e-4384-9191-f36354d1106f))
-  (pad "MP" smd roundrect (at -10.6 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a4938946-0c80-4940-a6b7-25cd29282f7c))
-  (pad "MP" smd roundrect (at 10.6 1.35) (size 1 2.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d9de09e8-6189-4660-a7ad-1e0e915728b4))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_GH_SM15B-GHS-TB_1x15-1MP_P1.25mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod
index ec2e633be..ac049ea84 100644
--- a/Connector_JST.pretty/JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod
@@ -1,55 +1,80 @@
-(footprint "JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST LEA series connector, SM02B-LEASS-TF (http://www.jst-mfg.com/product/pdf/eng/eLEA.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST LEA top entry")
+  (tags "connector JST LEA horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4.42) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4.42) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 83b6c92f-0986-4e40-802e-f681c50a6914)
   )
-  (fp_text value "JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal" (at 0 4.62) (layer "F.Fab")
+  (fp_text value JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal (at 0 4.62) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp bd7bd97a-f59d-4141-816b-045c923831d4)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4.05 -1.275) (end -2.55 -1.275)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.55 -1.275) (end -2.55 -2.875)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.55 -2.875) (end 2.55 -2.875)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.55 -2.875) (end 2.55 -1.275)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.55 -1.275) (end 4.05 -1.275)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.16 1.215) (end -4.16 -1.385)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.16 -1.385) (end -2.885 -1.385)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.885 -1.385) (end -2.885 -3.225)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.16 1.215) (end 4.16 -1.385)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.16 -1.385) (end 2.885 -1.385)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.99 3.535) (end -2.74 3.535)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.74 3.535) (end -2.74 3.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.74 3.135) (end 2.74 3.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.74 3.135) (end 2.74 3.535)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.74 3.535) (end 2.99 3.535)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.05 3.425) (end -2.85 3.425)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 3.425) (end -2.85 3.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 3.025) (end 2.85 3.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 3.025) (end 2.85 3.425)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 3.425) (end 4.05 3.425)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.05 -1.275) (end -4.05 3.425)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.05 -1.275) (end 4.05 3.425)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.6 -3.72) (end -4.6 3.92)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.6 3.92) (end 4.6 3.92)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.6 3.92) (end 4.6 -3.72)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.6 -3.72) (end -4.6 -3.72)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.35 -4.073553) (end -2.1 -3.72)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.1 -3.72) (end -1.85 -4.073553)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -4.073553) (end -2.35 -4.073553)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.1 -2.325) (size 1.05 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
+  (pad 2 smd roundrect (at 2.1 -2.325) (size 1.05 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
+  (pad MP smd roundrect (at -3.675 2.35) (size 0.85 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.675 2.35) (size 0.85 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 208c190e-9301-4db1-b366-d31333cd3494)
   )
-  (fp_line (start 2.74 3.135) (end 2.74 3.535) (layer "F.SilkS") (width 0.12) (tstamp 0dbc6a27-e6e6-410c-af13-fc88613d8d9d))
-  (fp_line (start -4.16 1.215) (end -4.16 -1.385) (layer "F.SilkS") (width 0.12) (tstamp 1a6242f8-590e-4bc7-8575-4e67977ebce5))
-  (fp_line (start 4.16 -1.385) (end 2.885 -1.385) (layer "F.SilkS") (width 0.12) (tstamp 343593ee-c20b-4d8d-9d5e-76df4a1d29b3))
-  (fp_line (start -2.74 3.535) (end -2.74 3.135) (layer "F.SilkS") (width 0.12) (tstamp 55b3c4a0-6369-4a1f-a245-a6f036f768fd))
-  (fp_line (start -2.99 3.535) (end -2.74 3.535) (layer "F.SilkS") (width 0.12) (tstamp 7ecc144d-226c-4b81-9946-bf8526566a34))
-  (fp_line (start 4.16 1.215) (end 4.16 -1.385) (layer "F.SilkS") (width 0.12) (tstamp 8b02e712-e077-4fa1-adcd-05e9023718ad))
-  (fp_line (start -2.885 -1.385) (end -2.885 -3.225) (layer "F.SilkS") (width 0.12) (tstamp a8366ef6-0adb-48d4-a2ea-2160e008faf7))
-  (fp_line (start -2.74 3.135) (end 2.74 3.135) (layer "F.SilkS") (width 0.12) (tstamp c0aad9bd-5fa3-4879-b9e0-bd6ce3e592cd))
-  (fp_line (start 2.74 3.535) (end 2.99 3.535) (layer "F.SilkS") (width 0.12) (tstamp d3234594-0a4a-4f8b-95f3-8f8b2d328f35))
-  (fp_line (start -4.16 -1.385) (end -2.885 -1.385) (layer "F.SilkS") (width 0.12) (tstamp f2d1355d-52e2-4273-961a-fa16b37e5a08))
-  (fp_line (start 4.6 3.92) (end 4.6 -3.72) (layer "F.CrtYd") (width 0.05) (tstamp 51896bea-e315-4a01-a7af-f2c29c486ab8))
-  (fp_line (start 4.6 -3.72) (end -4.6 -3.72) (layer "F.CrtYd") (width 0.05) (tstamp 58cb2c99-5e90-421a-b71f-a39a6ab73ed3))
-  (fp_line (start -4.6 3.92) (end 4.6 3.92) (layer "F.CrtYd") (width 0.05) (tstamp 5b3643f6-467f-48b3-a15b-2f9fe1cfbc65))
-  (fp_line (start -4.6 -3.72) (end -4.6 3.92) (layer "F.CrtYd") (width 0.05) (tstamp a1456704-3766-4992-adfe-4a500b491a92))
-  (fp_line (start 2.85 3.425) (end 4.05 3.425) (layer "F.Fab") (width 0.1) (tstamp 0523d44c-773b-467c-85b9-2777c0cbba75))
-  (fp_line (start -2.1 -3.72) (end -1.85 -4.073553) (layer "F.Fab") (width 0.1) (tstamp 2e8c779b-6c16-4d35-a61c-6dfb01222251))
-  (fp_line (start -2.55 -1.275) (end -2.55 -2.875) (layer "F.Fab") (width 0.1) (tstamp 36f394d9-0a10-4335-a2e5-2ec51ebe9f76))
-  (fp_line (start 2.55 -2.875) (end 2.55 -1.275) (layer "F.Fab") (width 0.1) (tstamp 43700fe7-ba9d-472d-a70b-18e4cd2fe306))
-  (fp_line (start -4.05 3.425) (end -2.85 3.425) (layer "F.Fab") (width 0.1) (tstamp 4934ede7-34a2-451e-bdfc-19a23b5c50c8))
-  (fp_line (start 2.55 -1.275) (end 4.05 -1.275) (layer "F.Fab") (width 0.1) (tstamp 4a65a167-aa49-4eb0-a2ef-21fbf6b3ef54))
-  (fp_line (start -4.05 -1.275) (end -4.05 3.425) (layer "F.Fab") (width 0.1) (tstamp 50217e5e-4bd1-47f9-a173-e03670206de7))
-  (fp_line (start -2.35 -4.073553) (end -2.1 -3.72) (layer "F.Fab") (width 0.1) (tstamp 6424f407-db56-48f4-b0ce-0c04240b46ab))
-  (fp_line (start -2.85 3.425) (end -2.85 3.025) (layer "F.Fab") (width 0.1) (tstamp 6709a4af-51b4-4ed0-9430-16a4b5ddfb7f))
-  (fp_line (start -1.85 -4.073553) (end -2.35 -4.073553) (layer "F.Fab") (width 0.1) (tstamp 7ba08397-9b4d-4997-b9dc-ee1f9f3997b9))
-  (fp_line (start 2.85 3.025) (end 2.85 3.425) (layer "F.Fab") (width 0.1) (tstamp aebccbeb-451f-45dd-960e-40f813b3f6f2))
-  (fp_line (start -4.05 -1.275) (end -2.55 -1.275) (layer "F.Fab") (width 0.1) (tstamp b2f5a433-ec7d-42f9-af95-08a499ab7770))
-  (fp_line (start -2.85 3.025) (end 2.85 3.025) (layer "F.Fab") (width 0.1) (tstamp bb7b2b39-bbf0-4a40-adbf-f84e36be84e1))
-  (fp_line (start 4.05 -1.275) (end 4.05 3.425) (layer "F.Fab") (width 0.1) (tstamp db522336-85ac-4eb6-bea8-499f3e623509))
-  (fp_line (start -2.55 -2.875) (end 2.55 -2.875) (layer "F.Fab") (width 0.1) (tstamp f5e79871-563a-4a4c-a6b5-5388e928c9b2))
-  (pad "1" smd roundrect (at -2.1 -2.325) (size 1.05 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.238095) (tstamp 7b375421-d4e4-4ec7-8342-88c4b72d6ec5))
-  (pad "2" smd roundrect (at 2.1 -2.325) (size 1.05 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.238095) (tstamp 0d0a5f55-52bb-4cf4-a51c-981c9e190d79))
-  (pad "MP" smd roundrect (at 3.675 2.35) (size 0.85 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 286bf483-d783-468e-b106-f07f8bb7d6cf))
-  (pad "MP" smd roundrect (at -3.675 2.35) (size 0.85 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eed1aa66-a1de-4a1d-83a7-87ca8e4c900e))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_LEA_SM02B-LEASS-TF_1x02-1MP_P4.20mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical.kicad_mod
index 072df45b0..d01bdab50 100644
--- a/Connector_JST.pretty/JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,92 +1,146 @@
-(footprint "JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B10B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp eb74651b-cc72-4cc2-9e81-1c1a54ea4dd0)
   )
-  (fp_text value "JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 88e09183-a283-4e91-b65f-3612e4ff78a0)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -11.975 0.75) (end 11.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.085 0.01) (end -12.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.085 0.86) (end -9.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.76 0.86) (end -9.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.085 0.01) (end 12.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.085 0.86) (end 9.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.085 -3.51) (end -12.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.085 -4.36) (end 12.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.085 -4.36) (end 12.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.975 -4.25) (end 11.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.975 0.75) (end -11.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.975 0.75) (end 11.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.75) (end -9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.25) (end -8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.25) (end -8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.75) (end -9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.75) (end -7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.25) (end -6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.25) (end -6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.75) (end -7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.75) (end -5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.25) (end -4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.25) (end -4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.75) (end -5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.75) (end -3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.25) (end -2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.25) (end -2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.75) (end -3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.75) (end 2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.25) (end 3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.25) (end 3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.75) (end 2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.75) (end 4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.25) (end 5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.25) (end 5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.75) (end 4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.75) (end 6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.25) (end 7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.25) (end 7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.75) (end 6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.75) (end 8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.25) (end 9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.25) (end 9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.75) (end 8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.7 -4.75) (end -12.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12.7 3.75) (end 12.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.7 3.75) (end 12.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.7 -4.75) (end -12.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.5 0.75) (end -9 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 0.042893) (end -8.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -11.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 11.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f484defd-d8ac-4222-961f-e32be5a009c0)
   )
-  (fp_line (start 12.085 0.86) (end 9.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 08d5876f-94a4-4f27-a41d-2bd1491c6dae))
-  (fp_line (start 12.085 -4.36) (end 12.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 240bf811-a91f-491f-abe8-cebd9065e61e))
-  (fp_line (start -12.085 -3.51) (end -12.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 4604464c-57c9-48fa-ae84-5f7997e0f20c))
-  (fp_line (start 12.085 0.01) (end 12.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 4afc190a-785d-475a-a828-4af967013e39))
-  (fp_line (start -12.085 0.01) (end -12.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 9ebe63fb-3841-466f-8a6e-0522d5bfc84e))
-  (fp_line (start -9.76 0.86) (end -9.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp a68c32e2-6e34-4c5f-b401-f6506c0b4fd9))
-  (fp_line (start -12.085 -4.36) (end 12.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp d8fcaf73-1cd2-4f1e-bc12-e665027cfaab))
-  (fp_line (start -12.085 0.86) (end -9.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp dc6b7ced-7403-4fe8-aa1b-db370b434e7c))
-  (fp_line (start 12.7 3.75) (end 12.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 30e330d7-48c6-4312-b66a-ff5dade07fcf))
-  (fp_line (start -12.7 -4.75) (end -12.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 66c1b973-3952-450a-8013-14951b414385))
-  (fp_line (start 12.7 -4.75) (end -12.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 6d482dd7-f849-4ec8-936f-6fc3001ea848))
-  (fp_line (start -12.7 3.75) (end 12.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp e3a87b6b-1dca-41fc-bcd7-54ca495ac358))
-  (fp_line (start -5.25 -2.25) (end -4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0268c55a-22b6-49dc-bb98-1905b7f8841a))
-  (fp_line (start -9.25 -2.25) (end -8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0cd25223-06c6-45e0-9823-97b9cde3238a))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 123be6ed-a406-40c6-b910-30f4c6bc800b))
-  (fp_line (start -8.75 -2.75) (end -9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 131eb902-6195-418e-a588-18e542395f8f))
-  (fp_line (start -2.75 -2.75) (end -3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1c8508a9-f87f-49c5-a74b-e2ac06d61d7e))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 2a77f6dc-75ef-4b2e-bb99-3dc1c043087f))
-  (fp_line (start 6.75 -2.25) (end 7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 319876aa-691d-43fa-90e7-fed68049f69a))
-  (fp_line (start 11.975 0.75) (end 11.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 3bb8a941-f7c1-4bf2-aec2-a769dd1379b8))
-  (fp_line (start -11.975 0.75) (end 11.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 437b5cf8-fa81-4684-a45b-352adf2accc4))
-  (fp_line (start -11.975 0.75) (end -11.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 575cc7b6-e32e-4d85-9129-139a40ae2e66))
-  (fp_line (start -4.75 -2.25) (end -4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 5bb88ec1-54ac-41ab-a28f-5632699724bd))
-  (fp_line (start 3.25 -2.75) (end 2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 5ecdfc40-d85c-448a-932d-2c26a373cd55))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5ed24823-a1b8-468a-9215-94e2d2af0120))
-  (fp_line (start -7.25 -2.75) (end -7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 64befa43-b2cc-41b9-a9cc-4339018bce48))
-  (fp_line (start 6.75 -2.75) (end 6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 68a82331-8b8d-43e6-a0a3-eed20b6bbbd2))
-  (fp_line (start 8.75 -2.25) (end 9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 720d8141-f4da-4ddf-9545-c0dd09bf6ff5))
-  (fp_line (start -3.25 -2.75) (end -3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 74c5d066-c091-4196-9747-2fe3a96e4534))
-  (fp_line (start -6.75 -2.75) (end -7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 791679ec-2bee-45da-957c-c0db4f86c55c))
-  (fp_line (start -8.75 -2.25) (end -8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 79e58292-da44-4623-887c-bf86cd750543))
-  (fp_line (start 4.75 -2.75) (end 4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7b4ab2c7-e486-4a55-8a35-909fb3c9b983))
-  (fp_line (start 8.75 -2.75) (end 8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7b892720-a20e-472c-86c5-eb0d5a0508b9))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7f29b31f-3b8d-4b69-8cb8-603f0fb7f6d2))
-  (fp_line (start -9.5 0.75) (end -9 0.042893) (layer "F.Fab") (width 0.1) (tstamp 826671cf-a0af-4daa-a85d-35b25ea7285f))
-  (fp_line (start -7.25 -2.25) (end -6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8a37b4d4-a131-465b-810d-c23f5289802d))
-  (fp_line (start -9 0.042893) (end -8.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 8b250369-5399-4456-b6ac-a6788b2a489c))
-  (fp_line (start 7.25 -2.75) (end 6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 9495d7b8-603c-4b6d-a8c5-2aaf0220b78f))
-  (fp_line (start 5.25 -2.25) (end 5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 9ad7946c-b00a-41db-837e-3943314443d1))
-  (fp_line (start -6.75 -2.25) (end -6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 9ad8295b-095d-4282-a0be-2fc8509d3be6))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 9db758ae-80d2-4367-8c03-ebcde222f07e))
-  (fp_line (start -3.25 -2.25) (end -2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp aae48bdd-4163-4af4-bf18-4d42e0f0e593))
-  (fp_line (start 2.75 -2.25) (end 3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b2876ef2-cdbe-45d8-8f4e-3c0423ce1928))
-  (fp_line (start -11.975 -4.25) (end 11.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp b56db1fd-1cdc-426c-850d-9cbef02ea152))
-  (fp_line (start -5.25 -2.75) (end -5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b6b513f6-bcbc-4954-8a8a-8a56f0a27236))
-  (fp_line (start 4.75 -2.25) (end 5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp bffc7561-463a-41ab-8adb-deb35f53469a))
-  (fp_line (start 2.75 -2.75) (end 2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp c434e0b2-1392-4cde-a388-ada29c99fc44))
-  (fp_line (start 9.25 -2.25) (end 9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp c8d36471-ed23-47f0-92a1-096d8aa956a3))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp d3c0cde0-c9cf-4501-a3e4-fc53e7009913))
-  (fp_line (start 3.25 -2.25) (end 3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d6d50505-46b0-48f2-97dd-0402240084ae))
-  (fp_line (start -2.75 -2.25) (end -2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e1f52f29-9316-488c-b2f2-b887ab7456b8))
-  (fp_line (start -9.25 -2.75) (end -9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e370046a-28ac-4b68-89ed-ffe763c0321e))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e96e5ecd-1257-45cf-86a7-a90ab17a5f8c))
-  (fp_line (start 9.25 -2.75) (end 8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp efaa8247-059a-4eba-a2e1-25610f569cb6))
-  (fp_line (start -4.75 -2.75) (end -5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp f6c897bf-cd24-430d-b84c-823e68a3f91e))
-  (fp_line (start 7.25 -2.25) (end 7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp f785ae13-2824-462e-90a3-eaaf483cfad4))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp fa6906c6-a642-4a6c-8a34-e9156af2c0cb))
-  (fp_line (start 5.25 -2.75) (end 4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp fbfa6a4e-f4b2-41ed-833d-8197c08080ba))
-  (pad "1" smd roundrect (at -9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d9b5480d-de26-451b-b259-981a03dd2d45))
-  (pad "2" smd roundrect (at -7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a212f871-10b5-4a45-ade6-f846b87e5153))
-  (pad "3" smd roundrect (at -5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a38bd5f2-346e-484a-86bb-74602715eee6))
-  (pad "4" smd roundrect (at -3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3955552b-6541-4076-b81e-140f8026ca54))
-  (pad "5" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1da3faec-2881-4be9-8150-8c5057c26dd1))
-  (pad "6" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 360d3fa1-20bc-46cc-94af-b5735e1eacef))
-  (pad "7" smd roundrect (at 3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 93aeafce-48f5-4841-800a-4dfff1f96f2e))
-  (pad "8" smd roundrect (at 5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9c9bbd7d-e03c-4773-8298-f38985b156af))
-  (pad "9" smd roundrect (at 7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 911a3a97-07ca-4c4d-9dba-89413ca9bb8e))
-  (pad "10" smd roundrect (at 9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 30926fdb-4601-46e7-ab94-77a66b0e82b0))
-  (pad "MP" smd roundrect (at -11.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 77a453e1-125b-437d-b0b9-25f8a445df42))
-  (pad "MP" smd roundrect (at 11.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp ad97589d-a3e2-4f2b-b4c1-7ef013b632c2))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B10B-PH-SM4-TB_1x10-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical.kicad_mod
index d4c8e443e..0c7d8b8f9 100644
--- a/Connector_JST.pretty/JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,97 +1,155 @@
-(footprint "JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B11B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 233e603b-7fb5-42f2-be9f-64c4c0e2d7bd)
   )
-  (fp_text value "JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 64e5ff4d-7c36-456e-b61d-4718fcb782ab)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -12.975 0.75) (end 12.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.085 0.01) (end -13.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.085 0.86) (end -10.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.76 0.86) (end -10.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.085 0.01) (end 13.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.085 0.86) (end 10.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.085 -3.51) (end -13.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.085 -4.36) (end 13.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.085 -4.36) (end 13.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.975 -4.25) (end 12.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.975 0.75) (end -12.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.975 0.75) (end 12.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 -2.75) (end -10.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 -2.25) (end -9.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -2.25) (end -9.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -2.75) (end -10.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.75) (end -8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.25) (end -7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.25) (end -7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.75) (end -8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.75) (end -6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.25) (end -5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.25) (end -5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.75) (end -6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.75) (end -4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.25) (end -3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.25) (end -3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.75) (end -4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.75) (end -2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.25) (end -1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.25) (end -1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.75) (end -2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.75) (end -0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.25) (end 0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.25) (end 0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.75) (end -0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.75) (end 1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.25) (end 2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.25) (end 2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.75) (end 1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.75) (end 3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.25) (end 4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.25) (end 4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.75) (end 3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.75) (end 5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.25) (end 6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.25) (end 6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.75) (end 5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.75) (end 7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.25) (end 8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.25) (end 8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.75) (end 7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -2.75) (end 9.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -2.25) (end 10.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 -2.25) (end 10.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 -2.75) (end 9.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.7 -4.75) (end -13.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13.7 3.75) (end 13.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.7 3.75) (end 13.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.7 -4.75) (end -13.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.5 0.75) (end -10 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 0.042893) (end -9.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -10 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 10 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -12.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 12.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5a489423-5428-4423-850b-d584494bfccf)
   )
-  (fp_line (start 13.085 0.01) (end 13.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 2467b666-f1ba-43e0-aaf0-898cd9c5850d))
-  (fp_line (start -10.76 0.86) (end -10.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 293fc4cc-d75f-44c8-a48b-a2c421f2043f))
-  (fp_line (start -13.085 0.01) (end -13.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 91631338-1911-44a9-80c6-faaab3571c2f))
-  (fp_line (start -13.085 -4.36) (end 13.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 9bb9bae6-ec8d-42f8-a3f1-6e57d27a7f27))
-  (fp_line (start 13.085 0.86) (end 10.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp a19addbc-f7fe-4b6c-9edc-54323bc2ba34))
-  (fp_line (start -13.085 -3.51) (end -13.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp a3b07a55-fe7f-4d78-8688-dbd62fb9da72))
-  (fp_line (start -13.085 0.86) (end -10.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp bb257689-a438-4727-9736-81a2d0b456a9))
-  (fp_line (start 13.085 -4.36) (end 13.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp dfb63fac-6b8c-4042-8073-23628beab034))
-  (fp_line (start -13.7 -4.75) (end -13.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 2f274c60-b1d1-4b20-ab24-1ac57a1165ca))
-  (fp_line (start -13.7 3.75) (end 13.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 66726cfb-a91c-4066-b7d2-52a8d12d2e52))
-  (fp_line (start 13.7 3.75) (end 13.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 75e4f289-3857-4a9e-81fb-5c4e58ee4c27))
-  (fp_line (start 13.7 -4.75) (end -13.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 8fec5c48-3098-4303-a007-ec614aadaa01))
-  (fp_line (start -8.25 -2.75) (end -8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 007d085c-33b7-400a-91b9-eaca2fdd0fe7))
-  (fp_line (start 9.75 -2.25) (end 10.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0a9c4ae4-ab87-4b3b-ba55-058032c02603))
-  (fp_line (start -8.25 -2.25) (end -7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0e1eb020-3feb-4db2-b286-892bb663414a))
-  (fp_line (start 7.75 -2.25) (end 8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 15d435a4-503a-4609-9cfa-590b60e09062))
-  (fp_line (start -1.75 -2.75) (end -2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1a07a239-6296-44f1-a77d-34bb7b9ff2ed))
-  (fp_line (start 10.25 -2.75) (end 9.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1cc831c9-66a4-4628-850f-9f78ec1372c5))
-  (fp_line (start 4.25 -2.75) (end 3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1de4c32a-a7a0-4fe3-b421-4ffce1a6b82e))
-  (fp_line (start -5.75 -2.25) (end -5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1e6db45d-d63c-48fb-9f26-fed8e34ee01a))
-  (fp_line (start -0.25 -2.25) (end 0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 2902e5c5-08f8-46a1-8a9d-351cf6edd6cd))
-  (fp_line (start -3.75 -2.25) (end -3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 2c089894-d706-4716-8daf-441ffe827435))
-  (fp_line (start 5.75 -2.75) (end 5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 2d2fd3ba-fff7-43c0-bea5-01f4688a43a5))
-  (fp_line (start 12.975 0.75) (end 12.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 2f3be0d8-50ba-4525-b871-688314659d7f))
-  (fp_line (start -9.75 -2.75) (end -10.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 3649123f-f102-433d-b240-888c2656595a))
-  (fp_line (start 5.75 -2.25) (end 6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 37aa1947-6e79-4f50-ae55-75404ee71533))
-  (fp_line (start -7.75 -2.25) (end -7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 4875f625-0515-418e-b8ae-9cd53d52e867))
-  (fp_line (start -0.25 -2.75) (end -0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 493a47a8-8edc-4822-ad38-85d5c5199975))
-  (fp_line (start 8.25 -2.75) (end 7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 4956a75c-3a08-4ca2-8238-dec3e8df4bbf))
-  (fp_line (start 10.25 -2.25) (end 10.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 4a34284f-2162-4979-ace4-7be0df414115))
-  (fp_line (start -10.5 0.75) (end -10 0.042893) (layer "F.Fab") (width 0.1) (tstamp 54e5d8e9-d872-4d2b-b505-246a03676b89))
-  (fp_line (start 8.25 -2.25) (end 8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 63082306-de09-47a5-b015-4e75cbd3bc05))
-  (fp_line (start 0.25 -2.25) (end 0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6673587a-27b1-4501-bc93-64e753d1b905))
-  (fp_line (start -1.75 -2.25) (end -1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6b0d438f-68ac-4426-a6b0-a6c373f39260))
-  (fp_line (start -2.25 -2.25) (end -1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 707331c3-1037-4b6a-9ed9-15b3f271ec4c))
-  (fp_line (start -2.25 -2.75) (end -2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8689522f-a678-42cd-800c-c26feb852d0b))
-  (fp_line (start -12.975 0.75) (end -12.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 8b1f315c-8527-43bc-9b59-c7b6dd76a843))
-  (fp_line (start -10.25 -2.25) (end -9.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8b56d4d3-2902-4ad8-a754-a0d309ed8787))
-  (fp_line (start -6.25 -2.75) (end -6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 9f4dd9c6-1653-4da5-841b-69869d6271e1))
-  (fp_line (start 2.25 -2.75) (end 1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp a0f5fed8-6a03-4e42-9c1a-6044118c2722))
-  (fp_line (start -12.975 -4.25) (end 12.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp a57b93fc-a013-4230-9f04-c76b6b2e3707))
-  (fp_line (start -10.25 -2.75) (end -10.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp abf54e9e-55d3-4735-92c5-d2e6e579af93))
-  (fp_line (start 0.25 -2.75) (end -0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ad029fa7-013b-42a9-ba37-b8dbb4a8ee46))
-  (fp_line (start -6.25 -2.25) (end -5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp af9f2527-67ae-43fe-842a-7e0f447df09c))
-  (fp_line (start -4.25 -2.25) (end -3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp b35bba61-22b2-413e-9283-24aa74d6a5d9))
-  (fp_line (start 9.75 -2.75) (end 9.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp b5a60021-af39-4423-9dd6-15ea7f84683d))
-  (fp_line (start -4.25 -2.75) (end -4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b985e051-bd8a-47b7-bf8a-3952de3eb640))
-  (fp_line (start 6.25 -2.25) (end 6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp b9b5b450-41ce-4ef6-98fa-fd5d2cf081f3))
-  (fp_line (start 4.25 -2.25) (end 4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp c0911f36-56a6-4f2f-81d0-90a04cf47aca))
-  (fp_line (start -9.75 -2.25) (end -9.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp c1606f1c-e97b-4ddb-b675-0eb19f464915))
-  (fp_line (start 1.75 -2.75) (end 1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp c1a93256-2745-4ef1-ba9a-887e54cd9c4d))
-  (fp_line (start -5.75 -2.75) (end -6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp c31c0abd-1733-46ff-8da7-03e536228ac0))
-  (fp_line (start -10 0.042893) (end -9.5 0.75) (layer "F.Fab") (width 0.1) (tstamp cf7e7569-f431-4931-b5b7-57d174d9c4cb))
-  (fp_line (start -3.75 -2.75) (end -4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d8469af2-397d-4e8a-8770-82b353940c54))
-  (fp_line (start 3.75 -2.25) (end 4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e10b5108-1826-4d5b-aeb5-8e89cb502673))
-  (fp_line (start 2.25 -2.25) (end 2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp eb23a5f6-9e25-45f3-8e52-a3670676813c))
-  (fp_line (start -7.75 -2.75) (end -8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ecb2eeac-f204-4158-bf1b-f702a92fe0d1))
-  (fp_line (start -12.975 0.75) (end 12.975 0.75) (layer "F.Fab") (width 0.1) (tstamp ed65a001-e0b0-4112-8add-af6c4e0879b6))
-  (fp_line (start 1.75 -2.25) (end 2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp ed6cce2e-1f68-40fe-a20c-33d6e83abbf7))
-  (fp_line (start 3.75 -2.75) (end 3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp ee72204a-1351-4f4e-af36-7a43f031c954))
-  (fp_line (start 6.25 -2.75) (end 5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp eef822e9-aa83-4487-afa7-aab4ef064fb4))
-  (fp_line (start 7.75 -2.75) (end 7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp fe830721-9716-4b6c-9145-174916e1327d))
-  (pad "1" smd roundrect (at -10 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5d6a26fb-8c5c-48c2-9c69-57f34e4683e6))
-  (pad "2" smd roundrect (at -8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 69931daa-ac89-46cf-bdc2-e4dbfe048c60))
-  (pad "3" smd roundrect (at -6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 212d7772-22a8-43db-bdb3-d7490a5a295a))
-  (pad "4" smd roundrect (at -4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6cdc3707-5067-48ed-9597-16fd523ecc8d))
-  (pad "5" smd roundrect (at -2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4b92544d-3f4a-4bfa-998e-7763fd068b7a))
-  (pad "6" smd roundrect (at 0 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 540ba60f-abc4-4b67-9a56-beec8db0f4d0))
-  (pad "7" smd roundrect (at 2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e65fa37-bcd0-4818-83ab-8f3b3f9b15ec))
-  (pad "8" smd roundrect (at 4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3ac97288-27ce-44ec-8c5e-13c218949544))
-  (pad "9" smd roundrect (at 6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fab5e412-a873-4854-9aae-55b10e20baa7))
-  (pad "10" smd roundrect (at 8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 08d27855-283a-4a94-9f65-9917231b1a25))
-  (pad "11" smd roundrect (at 10 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 86052774-d736-4373-afb3-515b116a0975))
-  (pad "MP" smd roundrect (at 12.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp bfb44708-0157-40ae-83d8-0981d2013e34))
-  (pad "MP" smd roundrect (at -12.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp f3eafdba-cbe5-40a6-8ea7-fad04c68047d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B11B-PH-SM4-TB_1x11-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical.kicad_mod
index f8d50f44e..d16e0d00e 100644
--- a/Connector_JST.pretty/JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,102 +1,164 @@
-(footprint "JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B12B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2263cc13-de6c-4a9b-946d-69fecd2d0c31)
   )
-  (fp_text value "JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cbaf4ff3-ae2e-462a-966f-28dc90ada147)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -13.975 0.75) (end 13.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.085 0.01) (end -14.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.085 0.86) (end -11.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.76 0.86) (end -11.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.085 0.01) (end 14.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.085 0.86) (end 11.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.085 -3.51) (end -14.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.085 -4.36) (end 14.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.085 -4.36) (end 14.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.975 -4.25) (end 13.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.975 0.75) (end -13.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.975 0.75) (end 13.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -2.75) (end -11.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -2.25) (end -10.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -2.25) (end -10.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -2.75) (end -11.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.75) (end -9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.25) (end -8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.25) (end -8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.75) (end -9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.75) (end -7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.25) (end -6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.25) (end -6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.75) (end -7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.75) (end -5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.25) (end -4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.25) (end -4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.75) (end -5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.75) (end -3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.25) (end -2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.25) (end -2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.75) (end -3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.75) (end 2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.25) (end 3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.25) (end 3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.75) (end 2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.75) (end 4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.25) (end 5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.25) (end 5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.75) (end 4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.75) (end 6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.25) (end 7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.25) (end 7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.75) (end 6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.75) (end 8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.25) (end 9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.25) (end 9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.75) (end 8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 -2.75) (end 10.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 -2.25) (end 11.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 -2.25) (end 11.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 -2.75) (end 10.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.7 -4.75) (end -14.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -14.7 3.75) (end 14.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.7 3.75) (end 14.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.7 -4.75) (end -14.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.5 0.75) (end -11 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11 0.042893) (end -10.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -11 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 11 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -13.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 13.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 27b7a0fd-9f1d-4188-8684-f6fc304971ac)
   )
-  (fp_line (start 14.085 -4.36) (end 14.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 0aae714a-4ba2-422d-bb9d-4206f4c4fe4a))
-  (fp_line (start -11.76 0.86) (end -11.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 0c771914-ad83-4ec0-b49a-239898175901))
-  (fp_line (start 14.085 0.86) (end 11.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 493ff15c-c67c-4a38-b42b-3323735732d6))
-  (fp_line (start 14.085 0.01) (end 14.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 7505ae85-d06f-4784-8ade-79393be5721a))
-  (fp_line (start -14.085 -3.51) (end -14.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp ae92c9b3-453b-4a61-a8f5-5b9c7a107f79))
-  (fp_line (start -14.085 0.01) (end -14.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp b2c6a13b-b9a3-4f99-b15d-e1d26b9c64ca))
-  (fp_line (start -14.085 -4.36) (end 14.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp c41d0f7e-42d0-47cb-af3d-d636ad1833f8))
-  (fp_line (start -14.085 0.86) (end -11.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp cfc176a1-72a2-41cb-aaf8-83d347320205))
-  (fp_line (start -14.7 3.75) (end 14.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 10cc09ac-b28b-4bab-ab9a-5ec121a257b6))
-  (fp_line (start -14.7 -4.75) (end -14.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 3f2eb55c-4d32-49b5-821c-e17c9c19f636))
-  (fp_line (start 14.7 3.75) (end 14.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp a74b0ade-e0f1-4a72-9e92-53e8814c9233))
-  (fp_line (start 14.7 -4.75) (end -14.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp fd817e48-cf20-4b39-8339-0ae9a55ceec8))
-  (fp_line (start -3.25 -2.25) (end -2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0a467652-2ebd-4281-9d96-571ea1e1801b))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 0ec4a953-2ed8-4b6b-9d25-0debb8b01baa))
-  (fp_line (start 8.75 -2.25) (end 9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 17907eba-69bb-4d97-ab46-fb7a2cd1c304))
-  (fp_line (start -11 0.042893) (end -10.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 1a2f3992-ae5a-4e72-af52-e2004e9e3701))
-  (fp_line (start 6.75 -2.25) (end 7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 1c879ba5-debf-4a4b-ac81-9eb345cd2f95))
-  (fp_line (start -13.975 0.75) (end -13.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 32ea71aa-bdc4-449c-b254-0aed562cee4d))
-  (fp_line (start -8.75 -2.25) (end -8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 36cfe3ee-0984-4c5d-bc6a-a2be01c00cb0))
-  (fp_line (start -6.75 -2.75) (end -7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 3923e973-2835-4d39-92d9-c3d47b99940a))
-  (fp_line (start 2.75 -2.25) (end 3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 394a9b7e-8f3d-4daf-b69f-1955793af369))
-  (fp_line (start 9.25 -2.75) (end 8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 43c118d0-cfcf-469f-84dd-6f0f02e64d3a))
-  (fp_line (start 2.75 -2.75) (end 2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 464ef7a7-1ba6-4854-ad4a-708182dd1120))
-  (fp_line (start -9.25 -2.25) (end -8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 4f0b2817-9b5f-4db4-959e-a1e7ea892e50))
-  (fp_line (start -9.25 -2.75) (end -9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 54ad0f2a-feeb-4084-9177-b7cabe80e76a))
-  (fp_line (start 5.25 -2.25) (end 5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 5745d67f-94c1-4fe4-9cb8-c12ebf83503c))
-  (fp_line (start -5.25 -2.75) (end -5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5eddc563-7d93-4063-9632-f2e8d91af70e))
-  (fp_line (start 8.75 -2.75) (end 8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5eec043f-f075-4424-9288-fa0643310d92))
-  (fp_line (start -11.25 -2.75) (end -11.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 621a36ba-0f57-47d6-94d5-93051b8765b3))
-  (fp_line (start 10.75 -2.75) (end 10.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 62590157-62f5-4897-a2aa-eec1d460de1d))
-  (fp_line (start -7.25 -2.25) (end -6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 68e8d8cc-abdc-49eb-9c73-1f29e5e4cab6))
-  (fp_line (start -13.975 0.75) (end 13.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 6c17dfca-db60-4eb0-a7c1-2044dd0daffa))
-  (fp_line (start -6.75 -2.25) (end -6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6c60f2b4-027d-492c-bcb7-43329c171fb7))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6e39bede-fcba-4ee7-85e7-ab626258e0b7))
-  (fp_line (start -3.25 -2.75) (end -3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 72b10763-7beb-4e18-afc8-036ba0ef3df8))
-  (fp_line (start 7.25 -2.75) (end 6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7395bbc7-c78c-4be7-9ad9-e54577f66025))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 75b52fa9-e995-4846-8366-1fa726254a60))
-  (fp_line (start -11.25 -2.25) (end -10.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 77339f68-0f5c-4cb3-8008-9c43ab926964))
-  (fp_line (start -8.75 -2.75) (end -9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7a42ef5c-0fe5-4011-bc85-759b54f1789d))
-  (fp_line (start 4.75 -2.25) (end 5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7bfb6834-b974-4a61-906c-a1853a40612e))
-  (fp_line (start 9.25 -2.25) (end 9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 85b5f389-f2e2-4180-ac3e-7a0d096989e9))
-  (fp_line (start -4.75 -2.75) (end -5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 85e07b6e-b920-4129-82b5-63f15b24c50e))
-  (fp_line (start -5.25 -2.25) (end -4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 86face13-367a-4cd7-8b92-7d808c0f3cd7))
-  (fp_line (start 11.25 -2.25) (end 11.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 8bf1fdd9-4dc5-415a-9dba-ae3dedf1d597))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 9097ba93-7e39-418e-9e7a-d194316c396e))
-  (fp_line (start 3.25 -2.75) (end 2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 9c5b39e8-88b3-4743-9b41-f011387c0c6c))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp a3a3354a-1db7-4768-998b-5d4007480772))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp a856bbc4-de4d-4f10-896a-7a49dc198b73))
-  (fp_line (start -11.5 0.75) (end -11 0.042893) (layer "F.Fab") (width 0.1) (tstamp aef7c4a4-13b1-4c39-a756-bda52d671747))
-  (fp_line (start 3.25 -2.25) (end 3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp b6e95035-6eab-40f1-83ca-2d6960309231))
-  (fp_line (start 4.75 -2.75) (end 4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp ba663dbe-fdd8-4faf-ae7c-fceaf304c40d))
-  (fp_line (start 5.25 -2.75) (end 4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp caa5f2e3-c7dc-4d83-b6dc-df52f4939151))
-  (fp_line (start -4.75 -2.25) (end -4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp cfa21ae6-f9b5-44e9-a154-2c4b4ecbbccf))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp cfd8066f-0008-4db6-aac9-f5c39033ed87))
-  (fp_line (start -2.75 -2.25) (end -2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d64a9255-661f-4c5b-8787-1724866149f8))
-  (fp_line (start 13.975 0.75) (end 13.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp d95eb5cf-c92b-4c62-b6c2-78ddf09c8014))
-  (fp_line (start 7.25 -2.25) (end 7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp dd452a11-aceb-4178-bc77-e5327bd3672b))
-  (fp_line (start -7.25 -2.75) (end -7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp dfe5abc8-b639-439c-a913-108091ca8482))
-  (fp_line (start -2.75 -2.75) (end -3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp e1b062c7-1807-413d-95f0-1f7604666d97))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp e438a894-b8f7-47b6-aec9-b7cd4eb07813))
-  (fp_line (start 11.25 -2.75) (end 10.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp ea9e904d-0fea-47bc-bc1c-55e7ef583263))
-  (fp_line (start 10.75 -2.25) (end 11.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp f3ac5b68-5c16-43c6-8388-790428cda58d))
-  (fp_line (start 6.75 -2.75) (end 6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp f9854d6a-a256-493f-b450-21373977a10d))
-  (fp_line (start -10.75 -2.25) (end -10.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f9a66d3a-81fd-423c-9345-a8ad66da52d7))
-  (fp_line (start -10.75 -2.75) (end -11.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp fc518e52-6435-4a05-8d7a-f4cd225c5c20))
-  (fp_line (start -13.975 -4.25) (end 13.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp fce2ed22-d565-4b34-92bf-0278001840a8))
-  (pad "1" smd roundrect (at -11 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 45b64528-6472-41b4-8554-3a908da85955))
-  (pad "2" smd roundrect (at -9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fd487440-b9ce-4813-90a4-f1ae2e7e6f00))
-  (pad "3" smd roundrect (at -7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 801b2aaf-dfeb-407f-97e5-93dc33ac7f19))
-  (pad "4" smd roundrect (at -5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 07196102-5ba1-4667-b5a8-f14477e64822))
-  (pad "5" smd roundrect (at -3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4360de62-f37e-469e-aaf5-0749cdebe2c3))
-  (pad "6" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1548ab48-1ab6-45e6-ab33-abd89c3da708))
-  (pad "7" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2a599cd9-5788-4298-8e65-e8212b5a6446))
-  (pad "8" smd roundrect (at 3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 13beb354-b0ec-4e60-8ed3-736586691fc0))
-  (pad "9" smd roundrect (at 5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bf06fbc5-343d-4805-9353-74d4f9d0969c))
-  (pad "10" smd roundrect (at 7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1fd2e855-cab4-44ad-a53f-7ab4d19905a8))
-  (pad "11" smd roundrect (at 9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 547cdd2f-65d3-445a-b5ab-abb69719ee1d))
-  (pad "12" smd roundrect (at 11 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3fa231ab-5bd1-4294-99cd-b17def5a799b))
-  (pad "MP" smd roundrect (at 13.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 25236873-ccf7-4baf-bc84-2d2bf4ca3a51))
-  (pad "MP" smd roundrect (at -13.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 75d43672-744f-42a0-ba3e-a10902e47c1c))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B12B-PH-SM4-TB_1x12-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical.kicad_mod
index e4cd7c109..053516449 100644
--- a/Connector_JST.pretty/JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,107 +1,173 @@
-(footprint "JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B13B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cb3eaa6c-0c25-4e19-ad7b-1bb15861ed02)
   )
-  (fp_text value "JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp aba44821-5132-4ac4-a52e-f2d1813222a5)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -14.975 0.75) (end 14.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.085 0.01) (end -15.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.085 0.86) (end -12.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.76 0.86) (end -12.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 15.085 0.01) (end 15.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 15.085 0.86) (end 12.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.085 -3.51) (end -15.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.085 -4.36) (end 15.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 15.085 -4.36) (end 15.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.975 -4.25) (end 14.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.975 0.75) (end -14.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.975 0.75) (end 14.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.25 -2.75) (end -12.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.25 -2.25) (end -11.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.75 -2.25) (end -11.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.75 -2.75) (end -12.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 -2.75) (end -10.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 -2.25) (end -9.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -2.25) (end -9.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -2.75) (end -10.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.75) (end -8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.25) (end -7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.25) (end -7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.75) (end -8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.75) (end -6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.25) (end -5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.25) (end -5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.75) (end -6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.75) (end -4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.25) (end -3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.25) (end -3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.75) (end -4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.75) (end -2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.25) (end -1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.25) (end -1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.75) (end -2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.75) (end -0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.25) (end 0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.25) (end 0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.75) (end -0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.75) (end 1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.25) (end 2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.25) (end 2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.75) (end 1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.75) (end 3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.25) (end 4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.25) (end 4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.75) (end 3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.75) (end 5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.25) (end 6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.25) (end 6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.75) (end 5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.75) (end 7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.25) (end 8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.25) (end 8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.75) (end 7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -2.75) (end 9.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -2.25) (end 10.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 -2.25) (end 10.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 -2.75) (end 9.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.75 -2.75) (end 11.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.75 -2.25) (end 12.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.25 -2.25) (end 12.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.25 -2.75) (end 11.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.7 -4.75) (end -15.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -15.7 3.75) (end 15.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.7 3.75) (end 15.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.7 -4.75) (end -15.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12.5 0.75) (end -12 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12 0.042893) (end -11.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -12 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -10 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 10 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 12 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -14.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 14.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 057c3d0f-911d-4eb7-ab99-6edd02d9a58a)
   )
-  (fp_line (start -15.085 -4.36) (end 15.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 00fbd562-4c42-42c5-9dd9-a86b775e9ab9))
-  (fp_line (start -15.085 0.86) (end -12.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 1bbe369c-6244-4225-b8b4-214e1c49bd91))
-  (fp_line (start 15.085 0.86) (end 12.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 5217eaa9-cf70-4e50-8ef6-eabf665e1653))
-  (fp_line (start -12.76 0.86) (end -12.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 8effb1a6-710b-44e9-a0f8-bb680e4a3e20))
-  (fp_line (start 15.085 0.01) (end 15.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp d52c1670-bf1f-4349-9ea4-43432b27c33a))
-  (fp_line (start 15.085 -4.36) (end 15.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp ed26a829-cf7d-48d4-99a4-d26d8537f6d8))
-  (fp_line (start -15.085 0.01) (end -15.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp ef12acde-91c6-48ce-81cb-cc82e974fdd2))
-  (fp_line (start -15.085 -3.51) (end -15.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp f60f9c11-a164-40e1-97fa-072a1cea4bc2))
-  (fp_line (start 15.7 3.75) (end 15.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 28d2612d-26e9-4482-8cfc-7c9bd1698759))
-  (fp_line (start -15.7 3.75) (end 15.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 610c77df-3e2d-48ee-9a5a-c3d72a2a26c7))
-  (fp_line (start 15.7 -4.75) (end -15.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 86773ef0-af35-44d1-abdf-59c0c79fe0c2))
-  (fp_line (start -15.7 -4.75) (end -15.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 8a702f5a-36d1-4bb8-9c3a-d71e7a31c148))
-  (fp_line (start -7.75 -2.75) (end -8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 06556115-4c1c-49cd-b8be-9a689658c371))
-  (fp_line (start -14.975 0.75) (end 14.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 08552809-6cff-4318-95e6-74c83db9ec06))
-  (fp_line (start -10.25 -2.25) (end -9.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 09276bec-f3d7-411b-8923-e251432f1653))
-  (fp_line (start -11.75 -2.75) (end -12.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 0961e12f-6982-4d86-9ff0-99e2cb22591f))
-  (fp_line (start -3.75 -2.75) (end -4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 0a55ff6c-ab35-4f48-bfe9-bd915d90e70f))
-  (fp_line (start 2.25 -2.25) (end 2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 15e2769d-51b4-4258-9eaa-e26cba1b7994))
-  (fp_line (start -6.25 -2.25) (end -5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 18a6ce2c-f416-4955-867f-7a68fa3bce77))
-  (fp_line (start -10.25 -2.75) (end -10.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 21ce519d-faa9-4c19-9628-8c0de7ce5065))
-  (fp_line (start 1.75 -2.25) (end 2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 23565903-27c2-47d6-87bb-94a0a0642c2a))
-  (fp_line (start -4.25 -2.75) (end -4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 2b204d1b-ae4e-4008-8f99-d9d3eb0f4785))
-  (fp_line (start -12.25 -2.75) (end -12.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 39b10c36-122e-4073-853c-35007b7e8caa))
-  (fp_line (start -6.25 -2.75) (end -6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 3e0e306f-260e-48b4-941d-f81baff50678))
-  (fp_line (start 0.25 -2.25) (end 0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 471749ad-6323-4492-b0a9-4623ef3367bf))
-  (fp_line (start 3.75 -2.25) (end 4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 4d003267-a38b-4a16-bd8b-f6008667e893))
-  (fp_line (start -2.25 -2.25) (end -1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 4ee949a3-a819-4652-aa05-8e038470be06))
-  (fp_line (start 11.75 -2.25) (end 12.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 507be472-79d8-45db-93fe-0bcff39f58f2))
-  (fp_line (start 4.25 -2.75) (end 3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 50b2f58b-8ab1-474b-8a54-3909ff0641c0))
-  (fp_line (start -11.75 -2.25) (end -11.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 55b450bb-b760-4968-bd78-72ad747ee04c))
-  (fp_line (start -8.25 -2.25) (end -7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 56cd6b71-66cd-4823-9a31-dc1063804da0))
-  (fp_line (start -5.75 -2.75) (end -6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 5ce99b9c-a440-41b5-bd18-a8ed6c754d10))
-  (fp_line (start -14.975 -4.25) (end 14.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 65328912-083d-45d3-adbc-a17beda6cdbb))
-  (fp_line (start 9.75 -2.25) (end 10.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6d152824-a081-4465-b5e5-ad8179a51615))
-  (fp_line (start 6.25 -2.75) (end 5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6fca0812-a778-4451-b0d0-3fd509c0a1c6))
-  (fp_line (start -2.25 -2.75) (end -2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7119cd80-b359-48f0-9a73-cc1cfff61bd6))
-  (fp_line (start -14.975 0.75) (end -14.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 7363dbd5-a7a7-48c0-bc91-a80bcfd46e6f))
-  (fp_line (start -7.75 -2.25) (end -7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 768d2683-5ac8-4279-b376-6fef6c1748f7))
-  (fp_line (start 8.25 -2.75) (end 7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7968039f-e89f-431a-a93a-802dfe31c595))
-  (fp_line (start -4.25 -2.25) (end -3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7cb55d7a-e9f2-4dea-927e-17382e683d0f))
-  (fp_line (start 11.75 -2.75) (end 11.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 931e5fb3-09c0-4b6b-9f3e-43b10320e0a5))
-  (fp_line (start -0.25 -2.25) (end 0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp a50998e5-014a-486c-aac5-e93210e7b8cf))
-  (fp_line (start -8.25 -2.75) (end -8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp a7687e17-b1e6-499c-9f7f-8fceeb2cde6d))
-  (fp_line (start -12.5 0.75) (end -12 0.042893) (layer "F.Fab") (width 0.1) (tstamp a9b6760c-00c2-4765-9490-187b2a77c530))
-  (fp_line (start 14.975 0.75) (end 14.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp afb2cc37-95bb-42e3-a415-78556e2822dd))
-  (fp_line (start 8.25 -2.25) (end 8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp b4af2497-c0a9-473e-a723-0bbedd9cc80a))
-  (fp_line (start -1.75 -2.25) (end -1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp b4ba685f-7dfd-4844-a472-da47ab8d085a))
-  (fp_line (start -9.75 -2.25) (end -9.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp b5274cb2-68c5-47a1-b1b1-ee711aed10ba))
-  (fp_line (start 4.25 -2.25) (end 4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp bd635561-a454-4707-95c6-a2a6f0f6c4e0))
-  (fp_line (start 3.75 -2.75) (end 3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp be0d7bb5-947e-4b71-8f06-196f27ead8bc))
-  (fp_line (start 5.75 -2.25) (end 6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp c58d9862-9a6c-4e9a-9467-38fc0909a963))
-  (fp_line (start 5.75 -2.75) (end 5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp c6503c8e-4a9c-41b4-984c-ac35fdb659ea))
-  (fp_line (start -9.75 -2.75) (end -10.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp cc4713bb-2cbc-41f7-85f0-fc6750a04ad9))
-  (fp_line (start -1.75 -2.75) (end -2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp cd3c3b1f-99ea-46f9-9429-f922abb786c4))
-  (fp_line (start 0.25 -2.75) (end -0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d28a885d-14c4-4f85-8e6a-1d72b5bc093a))
-  (fp_line (start 1.75 -2.75) (end 1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp d2a6795e-f35b-4604-b8a7-f2306b7ca0ed))
-  (fp_line (start 6.25 -2.25) (end 6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d6cf519a-4272-4120-bc01-a733b57ab595))
-  (fp_line (start -0.25 -2.75) (end -0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp dcf8aa3d-8d3c-4e07-a797-5c4341bf5604))
-  (fp_line (start 7.75 -2.25) (end 8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e52c1b8e-bfa9-43b2-8d83-5beade8be18f))
-  (fp_line (start 12.25 -2.25) (end 12.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp e8a1e650-36d0-47fd-bfe1-daa056f82cab))
-  (fp_line (start 7.75 -2.75) (end 7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp ee0b70ab-1981-4671-b67b-1bd1914597c2))
-  (fp_line (start 10.25 -2.75) (end 9.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f02c3fcb-3a34-489b-aa70-53a49dba99b7))
-  (fp_line (start 9.75 -2.75) (end 9.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp f10c9f34-9619-48b3-96c4-bf6c1c113a79))
-  (fp_line (start 2.25 -2.75) (end 1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f2a9e913-d192-4a91-96ae-84e456afae2b))
-  (fp_line (start 12.25 -2.75) (end 11.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f2e09a55-9630-49f4-bc4d-4fb359678f85))
-  (fp_line (start -12 0.042893) (end -11.5 0.75) (layer "F.Fab") (width 0.1) (tstamp f76f3c19-52af-4a83-bd3e-8588f2559f6d))
-  (fp_line (start 10.25 -2.25) (end 10.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp f818180d-9c8f-454c-8c69-6ed44e3fb068))
-  (fp_line (start -5.75 -2.25) (end -5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f8c3f4a1-ac01-41f9-b23a-fa77993d3732))
-  (fp_line (start -3.75 -2.25) (end -3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp fbd89a4e-4519-4448-80ea-d7022b461eed))
-  (fp_line (start -12.25 -2.25) (end -11.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp ff16a137-b07e-4af1-9e3e-70a6ef404ed6))
-  (pad "1" smd roundrect (at -12 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 20d4805a-e5f8-4b19-a7a6-5782673874c1))
-  (pad "2" smd roundrect (at -10 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6349e809-68ff-45e9-aa60-3e0da25eb6d3))
-  (pad "3" smd roundrect (at -8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ca7c1b48-92d9-4908-95b7-be6f8f877f7a))
-  (pad "4" smd roundrect (at -6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 338db835-dbc5-4a4d-beec-4a20610671da))
-  (pad "5" smd roundrect (at -4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8a1484e0-3627-49f3-b008-878f26cec446))
-  (pad "6" smd roundrect (at -2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c86cdf3e-d08e-43d0-883e-aa5746e810f0))
-  (pad "7" smd roundrect (at 0 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7994bb45-2ad2-4fc3-ae2d-f6b9c35548ad))
-  (pad "8" smd roundrect (at 2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 09daba48-b7e8-4eb4-af9a-72aefad935fc))
-  (pad "9" smd roundrect (at 4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2fdffe73-0b04-46dd-8844-40b0dbaf7926))
-  (pad "10" smd roundrect (at 6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d8746b7-ccf7-4956-8c6f-536a5125992b))
-  (pad "11" smd roundrect (at 8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 40a64e70-7454-42ca-99d6-22f25595edaa))
-  (pad "12" smd roundrect (at 10 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8109a02a-34ef-40c4-a2ae-cc016f8a29be))
-  (pad "13" smd roundrect (at 12 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c21daced-786b-42b6-8e1b-7034e03bf79b))
-  (pad "MP" smd roundrect (at -14.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 1d3f30c2-877e-4978-8961-55c718f1997e))
-  (pad "MP" smd roundrect (at 14.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 930c43da-3ef5-43c7-a174-b785014f3e64))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B13B-PH-SM4-TB_1x13-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical.kicad_mod
index dd4cc9fd9..7cb7291cd 100644
--- a/Connector_JST.pretty/JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,112 +1,182 @@
-(footprint "JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B14B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 32d24652-4feb-413d-8e28-d7e881b8bf4f)
   )
-  (fp_text value "JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 45720f65-5f93-49e7-aa54-13c587950a3f)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -15.975 0.75) (end 15.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.085 0.01) (end -16.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.085 0.86) (end -13.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.76 0.86) (end -13.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.085 0.01) (end 16.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.085 0.86) (end 13.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.085 -3.51) (end -16.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.085 -4.36) (end 16.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.085 -4.36) (end 16.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.975 -4.25) (end 15.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.975 0.75) (end -15.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 15.975 0.75) (end 15.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.25 -2.75) (end -13.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.25 -2.25) (end -12.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.75 -2.25) (end -12.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.75 -2.75) (end -13.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -2.75) (end -11.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -2.25) (end -10.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -2.25) (end -10.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -2.75) (end -11.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.75) (end -9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.25) (end -8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.25) (end -8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.75) (end -9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.75) (end -7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.25) (end -6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.25) (end -6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.75) (end -7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.75) (end -5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.25) (end -4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.25) (end -4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.75) (end -5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.75) (end -3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.25) (end -2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.25) (end -2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.75) (end -3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.75) (end 2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.25) (end 3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.25) (end 3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.75) (end 2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.75) (end 4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.25) (end 5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.25) (end 5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.75) (end 4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.75) (end 6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.25) (end 7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.25) (end 7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.75) (end 6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.75) (end 8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.25) (end 9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.25) (end 9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.75) (end 8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 -2.75) (end 10.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 -2.25) (end 11.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 -2.25) (end 11.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 -2.75) (end 10.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.75 -2.75) (end 12.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.75 -2.25) (end 13.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.25 -2.25) (end 13.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.25 -2.75) (end 12.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.7 -4.75) (end -16.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -16.7 3.75) (end 16.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 16.7 3.75) (end 16.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 16.7 -4.75) (end -16.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13.5 0.75) (end -13 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13 0.042893) (end -12.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -13 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -11 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 11 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 13 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -15.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 15.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7ddc7fa8-a53d-4838-8b69-4716f8a07b45)
   )
-  (fp_line (start 16.085 0.01) (end 16.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 18d6db85-065a-444e-bc71-db8ab8906ee0))
-  (fp_line (start -16.085 0.01) (end -16.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 68e5f1fa-ea18-4b8a-84f7-8be8bb815cdf))
-  (fp_line (start -16.085 -4.36) (end 16.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 698d5c2f-9454-4503-8e26-d5d6099a0572))
-  (fp_line (start 16.085 -4.36) (end 16.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 71eff3da-3481-4f3c-81ce-8a6c189dc1ee))
-  (fp_line (start 16.085 0.86) (end 13.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp a6fba5be-bae8-440f-8447-5fe6270ba39a))
-  (fp_line (start -16.085 0.86) (end -13.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp b76f5f7c-a507-47be-ba21-a950b27a3c61))
-  (fp_line (start -13.76 0.86) (end -13.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp d07f198b-877b-488b-ba96-2f936c75a9e2))
-  (fp_line (start -16.085 -3.51) (end -16.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp d9f20d95-d982-42ff-8208-9b4fdaf1bb0e))
-  (fp_line (start 16.7 3.75) (end 16.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 81229df8-4fe5-4aeb-8081-1b65ac8d4545))
-  (fp_line (start -16.7 3.75) (end 16.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 877724a8-4f9b-46ca-baa7-daeb7bdbb58c))
-  (fp_line (start 16.7 -4.75) (end -16.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp a23c2e30-b0fc-4af7-89ac-fd3c47fb7099))
-  (fp_line (start -16.7 -4.75) (end -16.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp bdc0c4b5-7873-4ce3-8d6d-c04b502cfa39))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 00d0f22d-f5e8-44a0-a299-f971fae9f495))
-  (fp_line (start 3.25 -2.75) (end 2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 07716499-9a2c-4453-8a95-bd44563b17af))
-  (fp_line (start 10.75 -2.25) (end 11.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0b484dc0-5584-4c1e-8386-cabd55804552))
-  (fp_line (start 7.25 -2.75) (end 6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 13294eee-bc6c-4c46-905f-ddbba6151f27))
-  (fp_line (start 6.75 -2.75) (end 6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 1b5f28ba-3b33-4e20-8192-18ab0064ae91))
-  (fp_line (start -5.25 -2.25) (end -4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 207de683-a53f-400b-8d26-667a172230df))
-  (fp_line (start 3.25 -2.25) (end 3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 257c0372-9789-4115-87f8-711890288762))
-  (fp_line (start -12.75 -2.25) (end -12.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 27e2320c-409e-4c84-b788-7d81daf9af31))
-  (fp_line (start 9.25 -2.75) (end 8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 2a6546ad-2ac8-4414-bec7-7bb3f47ede56))
-  (fp_line (start -3.25 -2.25) (end -2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 324f9b25-177d-43b1-8dfc-f525b9d3c690))
-  (fp_line (start 15.975 0.75) (end 15.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 35c238a9-d991-41f7-8b6c-97fd602d70d9))
-  (fp_line (start -2.75 -2.75) (end -3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 395f1a6c-833a-4688-aa82-17ac5102df88))
-  (fp_line (start -8.75 -2.75) (end -9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 412c458b-b3bd-40b0-a506-a20bd6498c97))
-  (fp_line (start -11.25 -2.75) (end -11.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 4326a5a3-d9b5-4920-97a1-67634a92f51a))
-  (fp_line (start -11.25 -2.25) (end -10.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 48083cd1-bcf9-4517-8cd3-fe55a9edcb12))
-  (fp_line (start -13 0.042893) (end -12.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 50f47767-95e9-430c-8053-d926cb7aecfe))
-  (fp_line (start 7.25 -2.25) (end 7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 52144095-f412-4b41-b510-c98612686fa5))
-  (fp_line (start -9.25 -2.75) (end -9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5e6f90f2-cbcf-456e-acd1-f3f6ff0d822f))
-  (fp_line (start -6.75 -2.75) (end -7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 610f309f-a459-4fa7-aeb7-09c65801e01d))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 618a253a-2f42-4576-add7-12b1d470a30f))
-  (fp_line (start 12.75 -2.75) (end 12.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 623c5d9a-c874-4e26-b28f-b3be7530ee0b))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6570213b-fb93-47f1-994d-460f518cca3d))
-  (fp_line (start -10.75 -2.75) (end -11.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6772cb87-abe9-443e-8e01-be41e41038a1))
-  (fp_line (start 4.75 -2.25) (end 5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 691e7640-57d1-4c5f-a74e-d8c81bc3480d))
-  (fp_line (start -4.75 -2.25) (end -4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 703c773f-d380-45b0-a774-ab4456db1b78))
-  (fp_line (start -6.75 -2.25) (end -6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 75f9b62a-b5ee-4ff7-9baa-cf6d4971c6df))
-  (fp_line (start -2.75 -2.25) (end -2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7a2c7bc2-025e-4404-9776-be72c0cc550b))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7a8b99b5-d297-4d59-b25d-d51998874422))
-  (fp_line (start 13.25 -2.25) (end 13.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 8261110b-6f6f-492f-83bf-3210a5775209))
-  (fp_line (start 9.25 -2.25) (end 9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 88f9e726-61ac-4eb3-9113-66f3e85904cb))
-  (fp_line (start 4.75 -2.75) (end 4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8add1de2-205b-46d8-bf4b-ce2b24140e56))
-  (fp_line (start -3.25 -2.75) (end -3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8f0e8023-d1bb-4e81-afda-fe1ab807faa9))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 93119f1f-0b60-4b01-b1f0-fa08e56e83fe))
-  (fp_line (start -7.25 -2.75) (end -7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 9322b5b0-fdde-483e-951b-2e4fbefefb01))
-  (fp_line (start 11.25 -2.25) (end 11.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 94006316-a23c-4e54-8434-a42c2a771c59))
-  (fp_line (start -15.975 0.75) (end -15.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 96bd0bbb-e3cf-4e79-ab70-5bfccf64a955))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 97bfd05b-c6e7-414d-b1e7-7925f2a2c61a))
-  (fp_line (start 13.25 -2.75) (end 12.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 97ea22b7-591f-4a90-8b72-fc42a98023c8))
-  (fp_line (start -13.25 -2.75) (end -13.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp a5e28168-d7ea-444a-bc1d-e5e4727cbd7a))
-  (fp_line (start 8.75 -2.25) (end 9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp aa03f46f-5662-4c58-b85f-1be5cc937fff))
-  (fp_line (start -5.25 -2.75) (end -5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp aa8ba070-aec3-47da-9d7b-394feb53d122))
-  (fp_line (start -8.75 -2.25) (end -8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp afd477e9-efd7-4d8e-9bdf-75586e001d87))
-  (fp_line (start 2.75 -2.25) (end 3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp c1922afb-0767-4704-ad8a-e3447cc793be))
-  (fp_line (start -13.5 0.75) (end -13 0.042893) (layer "F.Fab") (width 0.1) (tstamp c3a2e1d4-66b9-4625-8865-aaa61e95c786))
-  (fp_line (start -12.75 -2.75) (end -13.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp c68ff91f-85af-470b-af13-04d9ba00020f))
-  (fp_line (start -10.75 -2.25) (end -10.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp cf3a2796-f280-494d-81e2-aea5eb4c19e2))
-  (fp_line (start 11.25 -2.75) (end 10.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d2fcaab0-b996-4178-afb8-68a331c9dd94))
-  (fp_line (start 2.75 -2.75) (end 2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp d4705c17-dd85-44f5-9006-966deb40cb96))
-  (fp_line (start -4.75 -2.75) (end -5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d57bfbe6-7e86-4284-b574-e4341f8e21fc))
-  (fp_line (start -7.25 -2.25) (end -6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp d600bcd0-e57e-4138-ba72-0c8129aa309c))
-  (fp_line (start -15.975 -4.25) (end 15.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp d7ba62ee-6d89-4c53-b45a-ea1cd8b4d1f5))
-  (fp_line (start 10.75 -2.75) (end 10.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp de1580a1-1589-4079-947d-8c45c8c1020a))
-  (fp_line (start -15.975 0.75) (end 15.975 0.75) (layer "F.Fab") (width 0.1) (tstamp e04c931a-3843-4a09-9a16-19a2fbad57fb))
-  (fp_line (start 8.75 -2.75) (end 8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp e2d219ad-bca1-4ca0-8cc0-a2502f340a69))
-  (fp_line (start 6.75 -2.25) (end 7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e626301f-02db-43b0-bbe7-ecdab80aee15))
-  (fp_line (start 12.75 -2.25) (end 13.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e6f93a78-522a-4a05-a5e2-9b687975c643))
-  (fp_line (start 5.25 -2.75) (end 4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e82750ea-07ac-4a7e-895a-37f8d0bba0d3))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e9343d1d-7f0c-4111-bbc7-1a031c169228))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f813bf35-a48c-46ae-a653-5120ded25092))
-  (fp_line (start -13.25 -2.25) (end -12.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp fb6e0bd2-ab31-49d9-84ea-ba6320d8ec14))
-  (fp_line (start -9.25 -2.25) (end -8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp fda48d02-b8a3-43b3-bb13-7f042dbbe8ce))
-  (fp_line (start 5.25 -2.25) (end 5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp fdcc3ba3-aa04-4ee6-8702-cdcf41050425))
-  (pad "1" smd roundrect (at -13 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5b5a9783-f5f6-4c73-a6e3-1f5e75227f86))
-  (pad "2" smd roundrect (at -11 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6d1a0093-2f54-46b5-8b59-dc65a100a3a1))
-  (pad "3" smd roundrect (at -9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5871816a-e9bb-4635-9bc0-65efd0bbf49a))
-  (pad "4" smd roundrect (at -7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2d9e4e5e-591c-4518-96c9-814fa5e21243))
-  (pad "5" smd roundrect (at -5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ac1f1f23-1d9e-4fbf-b93b-bcfc68ca8361))
-  (pad "6" smd roundrect (at -3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d1e3380-c80b-414f-8d36-b9c4cebd5f3a))
-  (pad "7" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9ff21ed5-b76c-4fba-8d87-46d9db343b02))
-  (pad "8" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 129d9a8a-938e-4419-8ad0-9c258f51cd8d))
-  (pad "9" smd roundrect (at 3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 64344e2d-0f27-45ca-8c22-a44d1489c518))
-  (pad "10" smd roundrect (at 5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ce04a84d-aeb0-4882-9003-3daa633ef19e))
-  (pad "11" smd roundrect (at 7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9ad6e91a-dc25-4d78-aa36-04224d4f9dcd))
-  (pad "12" smd roundrect (at 9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a8d27b16-5bb5-4d55-bc84-372076840c97))
-  (pad "13" smd roundrect (at 11 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e5c6903a-d5a2-444e-b0a1-7c517a90a68c))
-  (pad "14" smd roundrect (at 13 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fe2c3346-77f7-4f39-88e4-96d208a23a74))
-  (pad "MP" smd roundrect (at 15.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 1addc354-9421-42ba-b5d6-7f0ca4aef7b7))
-  (pad "MP" smd roundrect (at -15.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 6e9e4356-d22c-4738-a3d9-0e33cfd2f736))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B14B-PH-SM4-TB_1x14-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical.kicad_mod
index c036e5591..238968502 100644
--- a/Connector_JST.pretty/JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,117 +1,191 @@
-(footprint "JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B15B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ced4f34a-3e63-44d3-bae1-66a104996f16)
   )
-  (fp_text value "JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2c9bf842-2914-447e-9b9f-6b89cbc6b433)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -16.975 0.75) (end 16.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -17.085 0.01) (end -17.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -17.085 0.86) (end -14.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.76 0.86) (end -14.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 17.085 0.01) (end 17.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 17.085 0.86) (end 14.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -17.085 -3.51) (end -17.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -17.085 -4.36) (end 17.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 17.085 -4.36) (end 17.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.975 -4.25) (end 16.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.975 0.75) (end -16.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 16.975 0.75) (end 16.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.25 -2.75) (end -14.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.25 -2.25) (end -13.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.75 -2.25) (end -13.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.75 -2.75) (end -14.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.25 -2.75) (end -12.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.25 -2.25) (end -11.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.75 -2.25) (end -11.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.75 -2.75) (end -12.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 -2.75) (end -10.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 -2.25) (end -9.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -2.25) (end -9.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -2.75) (end -10.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.75) (end -8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.25) (end -7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.25) (end -7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.75) (end -8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.75) (end -6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.25) (end -5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.25) (end -5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.75) (end -6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.75) (end -4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.25) (end -3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.25) (end -3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.75) (end -4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.75) (end -2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.25) (end -1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.25) (end -1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.75) (end -2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.75) (end -0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.25) (end 0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.25) (end 0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.75) (end -0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.75) (end 1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.25) (end 2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.25) (end 2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.75) (end 1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.75) (end 3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.25) (end 4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.25) (end 4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.75) (end 3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.75) (end 5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.25) (end 6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.25) (end 6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.75) (end 5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.75) (end 7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.25) (end 8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.25) (end 8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.75) (end 7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -2.75) (end 9.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -2.25) (end 10.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 -2.25) (end 10.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 -2.75) (end 9.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.75 -2.75) (end 11.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.75 -2.25) (end 12.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.25 -2.25) (end 12.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.25 -2.75) (end 11.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.75 -2.75) (end 13.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.75 -2.25) (end 14.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.25 -2.25) (end 14.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.25 -2.75) (end 13.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -17.7 -4.75) (end -17.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -17.7 3.75) (end 17.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 17.7 3.75) (end 17.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 17.7 -4.75) (end -17.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -14.5 0.75) (end -14 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14 0.042893) (end -13.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -14 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -12 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -10 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 10 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 12 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 14 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -16.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 16.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp bf089865-3f8f-41a2-a381-9c394dd2791a)
   )
-  (fp_line (start -17.085 0.86) (end -14.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 19b39375-26bd-4b1a-9168-3a02a4e76b41))
-  (fp_line (start 17.085 0.86) (end 14.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 4f5f1cb2-85f6-4cbc-bd18-ea9328885a74))
-  (fp_line (start -17.085 -3.51) (end -17.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 87bc9577-277d-48dc-b34a-257ccc306e67))
-  (fp_line (start -17.085 -4.36) (end 17.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp a8069805-1b32-45b2-a954-b675a7c8c709))
-  (fp_line (start 17.085 0.01) (end 17.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp b6a53553-e5f4-4f77-86ad-87cb4ea96680))
-  (fp_line (start 17.085 -4.36) (end 17.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp c7484045-9e53-4cf0-90d6-fbbaa575667d))
-  (fp_line (start -17.085 0.01) (end -17.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp ce249362-f193-4a4b-b171-bc379e0e0ecf))
-  (fp_line (start -14.76 0.86) (end -14.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp dd30f459-4612-4c7b-85b1-2f4a687cc12a))
-  (fp_line (start 17.7 -4.75) (end -17.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 07f392e6-4b0a-45cb-a3e9-464a96d6970e))
-  (fp_line (start -17.7 -4.75) (end -17.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 25276d71-6743-4f85-b9ec-e4627c1d9d3e))
-  (fp_line (start 17.7 3.75) (end 17.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp bd9ea31c-8e45-478e-ae95-57ad7d9416ff))
-  (fp_line (start -17.7 3.75) (end 17.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp e16bb349-2cef-48d7-8e51-333dae575939))
-  (fp_line (start 14.25 -2.25) (end 14.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 003b4706-6f33-4deb-a500-7ac0823dee75))
-  (fp_line (start 2.25 -2.25) (end 2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 01404eee-35c2-4a9e-81ba-8491ae1a2c38))
-  (fp_line (start 4.25 -2.25) (end 4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 029ed1b3-4b55-4d1d-8a57-c280d69b806c))
-  (fp_line (start -6.25 -2.25) (end -5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0468561e-a16b-4b9f-9ba0-a2e311674419))
-  (fp_line (start -14.25 -2.75) (end -14.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 09c4dd48-e774-4e2e-adfa-619bfc88f40a))
-  (fp_line (start -1.75 -2.25) (end -1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1dde930b-8ad4-4107-beb0-d644bf778ce5))
-  (fp_line (start -13.75 -2.75) (end -14.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 2252a8ed-9bdc-4423-87b8-f17ad70cd9d3))
-  (fp_line (start -1.75 -2.75) (end -2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 266e08aa-1a1f-4413-be85-44fbb6e26b2e))
-  (fp_line (start -12.25 -2.75) (end -12.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 2894c1f7-e7a0-46fd-91b3-a2ff9418d3bb))
-  (fp_line (start -14.5 0.75) (end -14 0.042893) (layer "F.Fab") (width 0.1) (tstamp 31d4678c-cd76-4c02-84e0-47c8e6af548c))
-  (fp_line (start 10.25 -2.25) (end 10.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 39ee858b-e4ec-48bf-a4a9-cc30ef9c94ec))
-  (fp_line (start -4.25 -2.25) (end -3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 42eeed44-0973-4b13-b922-138b4c1acd41))
-  (fp_line (start -11.75 -2.75) (end -12.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 47af629b-3921-4612-b0ed-7df87c3e0341))
-  (fp_line (start -8.25 -2.25) (end -7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 47e07f24-31e5-41cd-b361-c41267dccb22))
-  (fp_line (start -14 0.042893) (end -13.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 544b4cbb-f575-4b69-bd87-9ce9e6e093c5))
-  (fp_line (start 11.75 -2.75) (end 11.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5ae4f060-d95f-4da9-9353-2de38f83b783))
-  (fp_line (start 0.25 -2.25) (end 0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 5cac5613-3894-47f8-bef5-5367904a4912))
-  (fp_line (start -4.25 -2.75) (end -4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5d8fab82-e162-45e5-9016-1acc443a84a1))
-  (fp_line (start 8.25 -2.75) (end 7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 63b8172d-e91c-419d-a4f2-eb6163ccfc71))
-  (fp_line (start -5.75 -2.25) (end -5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6d8c6131-abff-4119-b26e-3ea95c07fbce))
-  (fp_line (start 16.975 0.75) (end 16.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 6fecefc9-21dd-46f6-a8ba-49c5577011f8))
-  (fp_line (start -2.25 -2.25) (end -1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7334b635-9989-444f-abee-3732e4c45d37))
-  (fp_line (start 7.75 -2.25) (end 8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 74322f5f-55d5-4e72-8cc5-b2199a24902c))
-  (fp_line (start -10.25 -2.25) (end -9.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 754ae498-fe99-46b6-a274-4a99963c5088))
-  (fp_line (start 6.25 -2.25) (end 6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7dc13534-57c3-45aa-8c3f-b3a455a2f45b))
-  (fp_line (start -14.25 -2.25) (end -13.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7fdacc49-c88e-468c-8ed1-d00f9f5e59d1))
-  (fp_line (start -2.25 -2.75) (end -2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8065e740-daca-452f-8ee8-a1a2a0ea22d8))
-  (fp_line (start 5.75 -2.25) (end 6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 84125ac5-257b-4b6b-b892-9dd5154cfa43))
-  (fp_line (start 5.75 -2.75) (end 5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 84cf093c-f8d0-45ac-9038-76db191d5a0d))
-  (fp_line (start 1.75 -2.25) (end 2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8c162919-020e-4fff-af7f-e48a165a9520))
-  (fp_line (start -12.25 -2.25) (end -11.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 918b85bc-e4f6-466f-94fc-f8518e644d18))
-  (fp_line (start 3.75 -2.25) (end 4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 937ad8f3-ba42-4c78-817b-7ffcdfe1f0fc))
-  (fp_line (start -11.75 -2.25) (end -11.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 952141ff-2380-480d-a411-11146f5e5325))
-  (fp_line (start -0.25 -2.25) (end 0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 96995a44-43dd-4fcd-8442-50521f818d4b))
-  (fp_line (start 13.75 -2.75) (end 13.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 9bce02e0-3bd5-4919-8274-15f049ed7991))
-  (fp_line (start -16.975 0.75) (end 16.975 0.75) (layer "F.Fab") (width 0.1) (tstamp a2969f22-b656-402e-b57e-0a6e54cacb3e))
-  (fp_line (start 8.25 -2.25) (end 8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp a46bc7c3-6ea5-42a6-9798-4dffdf16cf86))
-  (fp_line (start -3.75 -2.75) (end -4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp a47fa6e1-d65b-49e4-a37a-2d51ae242502))
-  (fp_line (start -13.75 -2.25) (end -13.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp aa4142cc-641c-4491-a85a-385ee900ad10))
-  (fp_line (start 13.75 -2.25) (end 14.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp ab19869f-507e-4cae-b9c0-01b4faad6f16))
-  (fp_line (start 0.25 -2.75) (end -0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp adb9d7f5-520e-46e3-9dfe-82d430b19811))
-  (fp_line (start 10.25 -2.75) (end 9.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp ae66c557-dd9f-4850-9258-5dd5411968f3))
-  (fp_line (start -6.25 -2.75) (end -6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b6b5c1c3-94cd-4c16-bf28-72deeca5c487))
-  (fp_line (start -0.25 -2.75) (end -0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b7e0e473-5b2d-46f3-8be5-ee80f88e0ebc))
-  (fp_line (start -5.75 -2.75) (end -6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp b8395f11-f577-4d0d-9665-7c120de284c8))
-  (fp_line (start 9.75 -2.25) (end 10.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp c42b039d-be84-48c7-acbf-e752e82889d1))
-  (fp_line (start 3.75 -2.75) (end 3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp c5d9bd22-38a3-4890-9c5c-daa31eb20233))
-  (fp_line (start 12.25 -2.75) (end 11.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d1f54284-c1a4-4169-818a-b3c203d28013))
-  (fp_line (start -16.975 -4.25) (end 16.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp d2b05679-86b1-4382-b54e-a5ebd94db91e))
-  (fp_line (start -10.25 -2.75) (end -10.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d2ca7bad-261b-41c9-abe0-f6bd2d7eec95))
-  (fp_line (start -9.75 -2.25) (end -9.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d7b01327-e2ea-4aeb-b797-0ee3fb42d720))
-  (fp_line (start 14.25 -2.75) (end 13.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d987b0d5-5f06-405c-a0fb-55c4d21263a1))
-  (fp_line (start -7.75 -2.25) (end -7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d9a5d928-24fb-4c7b-9ae7-2e011d535630))
-  (fp_line (start -7.75 -2.75) (end -8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp da0cd346-71f3-4b75-9845-90bba8f8376e))
-  (fp_line (start 4.25 -2.75) (end 3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp da86c43b-b909-496f-9b09-7ea93204167a))
-  (fp_line (start -9.75 -2.75) (end -10.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp db9e29a8-c1c4-4eb1-88cf-3faa4d8eb8a1))
-  (fp_line (start -3.75 -2.25) (end -3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp dfc9cc06-4f96-481d-a5a6-406d739cad11))
-  (fp_line (start -8.25 -2.75) (end -8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e30c2e84-f4f6-4785-b8f2-b676d0596c88))
-  (fp_line (start 6.25 -2.75) (end 5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e3acc686-c7ba-4043-a82d-dd26a061fb72))
-  (fp_line (start 11.75 -2.25) (end 12.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e6c1856f-69b6-47c6-946c-d0657f6c330d))
-  (fp_line (start 12.25 -2.25) (end 12.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ef7df57a-8202-4565-b369-20447e7bb637))
-  (fp_line (start -16.975 0.75) (end -16.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp efcc027b-7b30-4833-8608-5fc18ca01196))
-  (fp_line (start 1.75 -2.75) (end 1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp f435bdbe-ac4b-4173-aa7e-d9f2ebb68b36))
-  (fp_line (start 2.25 -2.75) (end 1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f85967f4-0413-4069-b6b1-a40b2d9260cc))
-  (fp_line (start 7.75 -2.75) (end 7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp fc6bf78b-c0b3-4279-89b6-75fb141999ab))
-  (fp_line (start 9.75 -2.75) (end 9.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp fedda6fa-c898-4870-96d6-e1ad556d1fd6))
-  (pad "1" smd roundrect (at -14 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3a9ab468-26c7-48ae-9247-c1273ecbc212))
-  (pad "2" smd roundrect (at -12 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4219e3b2-4da3-45fc-aadd-286a1b794253))
-  (pad "3" smd roundrect (at -10 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d8db476a-dc87-40e9-8ba8-f3181236a131))
-  (pad "4" smd roundrect (at -8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6c79b72a-833a-44f4-a3de-5db5e10a849c))
-  (pad "5" smd roundrect (at -6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 054d8a85-ec11-45d1-a9d2-03850fc9728a))
-  (pad "6" smd roundrect (at -4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ce3871e5-b221-4637-83aa-d04566fe59c0))
-  (pad "7" smd roundrect (at -2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4abe06da-eadb-4e36-a12a-a2eb5b0bfb90))
-  (pad "8" smd roundrect (at 0 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 25716d64-32d3-4c0d-bc85-b35f4034a212))
-  (pad "9" smd roundrect (at 2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6a8e5459-9476-4d75-8302-860b2e74d2e5))
-  (pad "10" smd roundrect (at 4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ed1c553f-640c-46b4-9633-42dd6626e302))
-  (pad "11" smd roundrect (at 6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 67d79b2d-d76e-454b-a9cf-7a8277fc8f0e))
-  (pad "12" smd roundrect (at 8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9eccc382-48be-4d6b-ad48-7f4e9adb4f0d))
-  (pad "13" smd roundrect (at 10 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1747770e-5a36-48fb-a073-eef8486fecfd))
-  (pad "14" smd roundrect (at 12 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2ea9efe7-291a-4085-9d2a-4c6e2211040a))
-  (pad "15" smd roundrect (at 14 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 57bc028f-5156-4728-99e7-90bf9c47332a))
-  (pad "MP" smd roundrect (at -16.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 887651fb-6eb6-48db-ae4a-a3706e2f32c0))
-  (pad "MP" smd roundrect (at 16.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp d52f1de7-20d0-47f4-80b0-d2ae0079bc34))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B15B-PH-SM4-TB_1x15-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical.kicad_mod
index 6b9d8c3d3..34a0dad10 100644
--- a/Connector_JST.pretty/JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,122 +1,200 @@
-(footprint "JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B16B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d994020a-8108-4c70-b68b-fbac80a93827)
   )
-  (fp_text value "JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a2969285-5951-425d-bd17-46bd2197e1c5)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -17.975 0.75) (end 17.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -18.085 0.01) (end -18.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -18.085 0.86) (end -15.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.76 0.86) (end -15.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 18.085 0.01) (end 18.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 18.085 0.86) (end 15.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -18.085 -3.51) (end -18.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -18.085 -4.36) (end 18.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 18.085 -4.36) (end 18.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -17.975 -4.25) (end 17.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -17.975 0.75) (end -17.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 17.975 0.75) (end 17.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.25 -2.75) (end -15.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.25 -2.25) (end -14.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.75 -2.25) (end -14.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.75 -2.75) (end -15.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.25 -2.75) (end -13.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.25 -2.25) (end -12.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.75 -2.25) (end -12.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.75 -2.75) (end -13.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -2.75) (end -11.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -2.25) (end -10.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -2.25) (end -10.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -2.75) (end -11.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.75) (end -9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -2.25) (end -8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.25) (end -8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -2.75) (end -9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.75) (end -7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.25) (end -6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.25) (end -6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.75) (end -7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.75) (end -5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.25) (end -4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.25) (end -4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.75) (end -5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.75) (end -3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.25) (end -2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.25) (end -2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.75) (end -3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.75) (end 2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.25) (end 3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.25) (end 3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.75) (end 2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.75) (end 4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.25) (end 5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.25) (end 5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.75) (end 4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.75) (end 6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.25) (end 7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.25) (end 7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.75) (end 6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.75) (end 8.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -2.25) (end 9.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.25) (end 9.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -2.75) (end 8.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 -2.75) (end 10.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 -2.25) (end 11.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 -2.25) (end 11.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 -2.75) (end 10.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.75 -2.75) (end 12.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.75 -2.25) (end 13.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.25 -2.25) (end 13.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.25 -2.75) (end 12.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.75 -2.75) (end 14.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.75 -2.25) (end 15.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 15.25 -2.25) (end 15.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 15.25 -2.75) (end 14.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -18.7 -4.75) (end -18.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -18.7 3.75) (end 18.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 18.7 3.75) (end 18.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 18.7 -4.75) (end -18.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -15.5 0.75) (end -15 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15 0.042893) (end -14.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -15 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -13 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -11 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 9 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 11 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 13 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 15 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -17.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 17.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1360da01-9609-4959-b395-2936ded66c98)
   )
-  (fp_line (start -18.085 0.86) (end -15.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 2915d2a9-4e18-480e-b975-9c8606b62609))
-  (fp_line (start -18.085 -3.51) (end -18.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 36ed49aa-f7e0-4240-b03a-6aa747977011))
-  (fp_line (start -18.085 -4.36) (end 18.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 4af8396c-9cac-40c3-a0ec-87224c3ef115))
-  (fp_line (start 18.085 0.01) (end 18.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 746e9263-4d58-4449-be4a-1eb68a44bf2a))
-  (fp_line (start 18.085 -4.36) (end 18.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 81b25e91-252a-481e-8e35-0e56a043c8dc))
-  (fp_line (start -18.085 0.01) (end -18.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 9321907e-20b7-4852-a245-9d1881f373e8))
-  (fp_line (start 18.085 0.86) (end 15.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp a7ec6705-d0e0-4cd9-b91b-334600da1f39))
-  (fp_line (start -15.76 0.86) (end -15.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp e7f8579e-87b0-4d75-b8ae-983381b25c05))
-  (fp_line (start 18.7 3.75) (end 18.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 260d23c9-c666-4b7f-99f4-f1005ca39761))
-  (fp_line (start -18.7 3.75) (end 18.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 4858d738-5ddb-4313-a17f-1c8a94c17032))
-  (fp_line (start -18.7 -4.75) (end -18.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 687b0677-861a-4e9b-adcb-339f1b9916f8))
-  (fp_line (start 18.7 -4.75) (end -18.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 9bbbff23-2651-49aa-84d2-e76ac347d374))
-  (fp_line (start -6.75 -2.25) (end -6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 05657db8-a0fa-430c-8216-0773f1b84d05))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 05f9dd3a-7f24-4100-a500-6b50f3dad231))
-  (fp_line (start -13.25 -2.25) (end -12.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0b342697-bbd9-4048-b5ab-ca3f3b44bdbf))
-  (fp_line (start -15.25 -2.25) (end -14.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0e2ed90d-4f5e-4b59-b75c-a74079cc7d7c))
-  (fp_line (start 10.75 -2.25) (end 11.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 12ea43ee-11d6-4130-9301-87ec325c026c))
-  (fp_line (start 3.25 -2.25) (end 3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 176fb0f9-4771-4e85-af87-90b96a71582f))
-  (fp_line (start 4.75 -2.25) (end 5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 1ebcd21f-72d8-427b-9623-08178341e472))
-  (fp_line (start 12.75 -2.75) (end 12.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 224f2635-907d-402c-8f09-eed6ab0917c7))
-  (fp_line (start -10.75 -2.75) (end -11.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 30763f71-138a-457c-afa3-e6666f73e865))
-  (fp_line (start 7.25 -2.25) (end 7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 32dd2a73-97d4-4e26-bb36-d301bf8c6db5))
-  (fp_line (start -13.25 -2.75) (end -13.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 36949601-dbe7-4dbf-89cf-6320b046898d))
-  (fp_line (start 17.975 0.75) (end 17.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 3963dfbe-f1b3-4b77-94b4-dfadd0751c42))
-  (fp_line (start -4.75 -2.75) (end -5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 42bc4ad4-acd0-4742-940f-611ac446e7dd))
-  (fp_line (start -17.975 0.75) (end -17.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 4c03cf6a-53cf-4ef4-b670-8775245b87b5))
-  (fp_line (start 5.25 -2.75) (end 4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 517caf9d-03cd-410d-aa5c-69b4456fcd29))
-  (fp_line (start 7.25 -2.75) (end 6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 58fd7d2d-eaa7-4726-bd0d-d6ce4d552d21))
-  (fp_line (start 10.75 -2.75) (end 10.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5a9b5720-571e-40f6-ba35-e4b1eb7942cd))
-  (fp_line (start 6.75 -2.25) (end 7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 641005a0-a102-48b2-bdd9-397491f83278))
-  (fp_line (start 8.75 -2.75) (end 8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6725950d-6d52-4a48-a0fc-afce3c9c6eac))
-  (fp_line (start -12.75 -2.75) (end -13.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 69730977-3a5d-452e-b873-e7f8ab84f289))
-  (fp_line (start 8.75 -2.25) (end 9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6a8a5120-583d-4f4c-a5db-e036613338a5))
-  (fp_line (start -5.25 -2.25) (end -4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6af51d35-553b-4492-93f1-553fdece6b58))
-  (fp_line (start 9.25 -2.25) (end 9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6eec8be2-89c9-4771-9cbe-185ae01ee5f6))
-  (fp_line (start 14.75 -2.25) (end 15.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6fb5e883-4585-4440-9b74-307c9add93b0))
-  (fp_line (start -4.75 -2.25) (end -4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 706f5976-7486-4bd1-bbda-7fd5a0a6c9fc))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 76d206c7-a8d5-42e0-ae2e-e573ac048877))
-  (fp_line (start 13.25 -2.25) (end 13.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7caf604c-0866-4697-bdfc-2abfa5d14df8))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7d7dbae0-f3bc-4996-a299-fab3595ce4ae))
-  (fp_line (start -15.5 0.75) (end -15 0.042893) (layer "F.Fab") (width 0.1) (tstamp 87008581-885e-4059-8f9f-9d2e5b335fc9))
-  (fp_line (start -11.25 -2.25) (end -10.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 892ec218-92cb-4178-9541-0572bc41feec))
-  (fp_line (start 12.75 -2.25) (end 13.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8a070075-3c91-4b08-82d6-91cd37c51322))
-  (fp_line (start 2.75 -2.25) (end 3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8e03b467-1ebc-4a22-88c5-144069e44690))
-  (fp_line (start -2.75 -2.25) (end -2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 8f19e00f-86b0-4d6e-9321-e180a897b383))
-  (fp_line (start -6.75 -2.75) (end -7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 905eaa8d-a1b5-4923-95bb-577dc9791716))
-  (fp_line (start -3.25 -2.25) (end -2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 96ada297-a135-481f-8161-097a483bb709))
-  (fp_line (start -15.25 -2.75) (end -15.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 9f7df8b5-21a3-41f3-8ae2-9e39156d09f6))
-  (fp_line (start 13.25 -2.75) (end 12.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp a3976238-f38e-4e1e-a62e-e2e35a82a4c5))
-  (fp_line (start 4.75 -2.75) (end 4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp a6cb3a56-2e5f-449c-bf74-eac6f81cd523))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp a75ef3e9-c298-4fb3-b3b5-95df58cdadce))
-  (fp_line (start -5.25 -2.75) (end -5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp a8d70d96-1194-4eff-8fa2-5a43ebb75e3c))
-  (fp_line (start -3.25 -2.75) (end -3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp a9a09666-61d2-42a0-9312-2173aa753426))
-  (fp_line (start -7.25 -2.75) (end -7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp ac5281ef-2e17-4350-a461-28dec57a0af1))
-  (fp_line (start 2.75 -2.75) (end 2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp aea84c97-5a75-4deb-b507-9a87ed80dbf4))
-  (fp_line (start 15.25 -2.25) (end 15.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp afc7e45c-3c02-4d09-b48b-77d2354e6721))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b03d6fb1-2c29-48a9-a672-79c2cd509d97))
-  (fp_line (start 15.25 -2.75) (end 14.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp b0bf4477-4170-47ba-b15e-8a9bbe204e06))
-  (fp_line (start -17.975 -4.25) (end 17.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp b179a86f-7a00-46e2-a656-8bfe65dd7f62))
-  (fp_line (start -17.975 0.75) (end 17.975 0.75) (layer "F.Fab") (width 0.1) (tstamp b4652a15-b7ad-4cdc-9099-3b54e13ac638))
-  (fp_line (start -7.25 -2.25) (end -6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp b84c4649-b29e-489b-ace3-a8be6c0adc90))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp b8ceb3d3-7c20-418f-a0ef-b3c8b227b10d))
-  (fp_line (start -9.25 -2.25) (end -8.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp bde55563-f2d0-47b1-94cc-760f6ff35771))
-  (fp_line (start -15 0.042893) (end -14.5 0.75) (layer "F.Fab") (width 0.1) (tstamp bf539948-5f6a-45d6-af69-9f161bff7b6d))
-  (fp_line (start 3.25 -2.75) (end 2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp c395535b-62d2-42e2-9d1e-c85dcf374c74))
-  (fp_line (start 11.25 -2.25) (end 11.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp c3bce52f-dfd2-4875-8e75-5d7145025374))
-  (fp_line (start 9.25 -2.75) (end 8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp c4513626-569b-4263-b707-ced0067c8202))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp c61e4f73-4993-4852-be4e-f84a81892faf))
-  (fp_line (start -11.25 -2.75) (end -11.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d20787e3-196f-4036-8fa5-79aa0c27df9a))
-  (fp_line (start 11.25 -2.75) (end 10.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d316e1cc-25f9-429a-b7f6-df6550add91c))
-  (fp_line (start -9.25 -2.75) (end -9.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d4638f40-f83d-4976-be76-70f8de13d168))
-  (fp_line (start -12.75 -2.25) (end -12.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d84b62c0-ea4e-429f-b388-c074001e27dd))
-  (fp_line (start 5.25 -2.25) (end 5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp e0bc409f-3198-481a-a616-e85d1e1f7803))
-  (fp_line (start 6.75 -2.75) (end 6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp e91ec29d-1408-4bbf-9e6e-f0ebeb80def0))
-  (fp_line (start -8.75 -2.75) (end -9.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ee028de9-6830-4479-bc11-d664fd914db2))
-  (fp_line (start -2.75 -2.75) (end -3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp f0bdeaca-d056-457e-b094-f77baf541305))
-  (fp_line (start -8.75 -2.25) (end -8.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f57e0ce6-010b-4568-be92-bbeec5e41b86))
-  (fp_line (start 14.75 -2.75) (end 14.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp f5d77aa8-dada-4ad3-b1cd-909df1dcd0c8))
-  (fp_line (start -14.75 -2.25) (end -14.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f79f0f88-ca90-4e19-84cd-975eb3c7e91e))
-  (fp_line (start -10.75 -2.25) (end -10.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f9f520ed-798d-4b5b-983f-82a1b09fbdb7))
-  (fp_line (start -14.75 -2.75) (end -15.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp fbf2359e-6611-42e1-8bd2-37e1889ced89))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp fe406cea-4cf6-4436-893a-e371b4d27760))
-  (pad "1" smd roundrect (at -15 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e131d391-59d8-478b-ba80-a07709587efa))
-  (pad "2" smd roundrect (at -13 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7ddc8a75-cf4d-4d96-8ac1-4846043eca75))
-  (pad "3" smd roundrect (at -11 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2cd70539-48f3-45b8-82a0-3fea5ee2f312))
-  (pad "4" smd roundrect (at -9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 447ebbe1-b74e-42af-9495-30b7e4b12358))
-  (pad "5" smd roundrect (at -7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7db3a3ae-4cd2-44d9-957a-df2c97121165))
-  (pad "6" smd roundrect (at -5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 525e3941-fa19-4928-be6a-cab1f11424de))
-  (pad "7" smd roundrect (at -3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8b822b2a-b75f-4641-b6da-b1a2558616a7))
-  (pad "8" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bf623476-0da2-45a2-a3e3-6abb5c01b578))
-  (pad "9" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c9624f20-9eb3-4aa5-9678-5d62816d54dc))
-  (pad "10" smd roundrect (at 3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bcfbfe87-4f92-49cc-a5c8-1935a537f9b7))
-  (pad "11" smd roundrect (at 5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a1157d07-89f4-46b1-8afd-aa20651b55c3))
-  (pad "12" smd roundrect (at 7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0b55aaf7-764b-49fd-8fb8-5df4ae3fd22d))
-  (pad "13" smd roundrect (at 9 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 87bb182d-3101-4859-b67f-77abdaa50a34))
-  (pad "14" smd roundrect (at 11 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d1721d0b-1ecd-49ff-8cef-8287fc59704f))
-  (pad "15" smd roundrect (at 13 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e2ec2e6e-7846-4bdf-9ac5-4b3781930dd9))
-  (pad "16" smd roundrect (at 15 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 902f7d55-015e-482c-8da2-2de5dcd3f84d))
-  (pad "MP" smd roundrect (at -17.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp d38eb6ab-0534-42aa-b61f-fec8e6fd71b8))
-  (pad "MP" smd roundrect (at 17.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp f0d4f6a6-72b4-4659-a331-7be2f9e652cc))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B16B-PH-SM4-TB_1x16-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical.kicad_mod
index 9411e3021..7c1da201b 100644
--- a/Connector_JST.pretty/JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,52 +1,74 @@
-(footprint "JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B2B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c3ea5590-8dac-4cb0-9493-2d5ed1bce686)
   )
-  (fp_text value "JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 43729bcd-8a20-462a-8488-9df4069bb408)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -3.975 0.75) (end 3.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.085 0.01) (end -4.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.085 0.86) (end -1.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.76 0.86) (end -1.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.085 0.01) (end 4.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.085 0.86) (end 1.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.085 -3.51) (end -4.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.085 -4.36) (end 4.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.085 -4.36) (end 4.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.975 -4.25) (end 3.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.975 0.75) (end -3.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.975 0.75) (end 3.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.7 -4.75) (end -4.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.7 3.75) (end 4.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.7 3.75) (end 4.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.7 -4.75) (end -4.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.5 0.75) (end -1 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0.042893) (end -0.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 3.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 67078034-80e0-4775-9647-5d3ae0d837f8)
   )
-  (fp_line (start -4.085 0.86) (end -1.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 0cdaf7a6-9e19-452c-b54f-26b5b4e4e990))
-  (fp_line (start 4.085 0.86) (end 1.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 0e1de166-778f-4050-b39a-75fe0c0b257a))
-  (fp_line (start 4.085 -4.36) (end 4.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 3e69f795-6ad5-4590-8d8b-a5d3621044e9))
-  (fp_line (start 4.085 0.01) (end 4.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 64c75eef-6e21-4280-9513-7fbbe15eac2b))
-  (fp_line (start -4.085 -4.36) (end 4.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp a4041a8b-3597-4388-932c-c40311a88446))
-  (fp_line (start -4.085 -3.51) (end -4.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp cc4e7ef2-d35c-4b86-a5de-31d08972aa1b))
-  (fp_line (start -4.085 0.01) (end -4.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp d71b741b-8a43-4138-a31d-19254e94e5c9))
-  (fp_line (start -1.76 0.86) (end -1.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp e855c9e4-9f77-4d8a-93a6-361ceaa0dbb8))
-  (fp_line (start 4.7 3.75) (end 4.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 225dd9f3-8051-4e92-8357-d8e1281d9414))
-  (fp_line (start -4.7 3.75) (end 4.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 31d21c4e-3f41-4df9-9e98-1469e2b743f2))
-  (fp_line (start 4.7 -4.75) (end -4.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 95424112-ac78-415f-81d9-2b14c7f96dc4))
-  (fp_line (start -4.7 -4.75) (end -4.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp ee435d7d-6af1-4494-a2a9-f2753c514173))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1a7132b8-0691-4bc0-aa53-1f25f66e936b))
-  (fp_line (start -3.975 0.75) (end -3.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 2db73cd1-db4d-4a13-8d10-7988e9bbee7e))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 3521fabc-8456-42e0-878a-82db4b0c1360))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 42bf24f0-1ae0-4260-b4b9-28a6e6814582))
-  (fp_line (start -1 0.042893) (end -0.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 442c4555-d137-4312-832c-c55998825a89))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 4790f402-7655-48a0-8cfb-0d1da8f43c77))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 47b48e76-0f14-4148-ac24-190ee9f2167f))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 47e9b920-303b-4039-b034-88959a361e57))
-  (fp_line (start -3.975 0.75) (end 3.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 4b8cfe69-6a64-401c-a8c3-0b76bfaca946))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 951ae023-9477-4967-8fcd-60458b717e66))
-  (fp_line (start 3.975 0.75) (end 3.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp a7787885-8861-416d-be34-224b77f15b60))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp c953cf05-cf5f-40bd-a65e-94b3638cbccb))
-  (fp_line (start -3.975 -4.25) (end 3.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp d6cd5b5b-f043-43d5-8c12-fae8152fec40))
-  (fp_line (start -1.5 0.75) (end -1 0.042893) (layer "F.Fab") (width 0.1) (tstamp fd4a781f-5c14-4c76-8bb9-24f5be1c12e7))
-  (pad "1" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 174c1a0b-992f-49d1-ab6e-90fc6c2ace36))
-  (pad "2" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 13558603-6c53-4893-8f36-4ce7b241b63e))
-  (pad "MP" smd roundrect (at 3.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 4a9510a1-48c1-4c11-8ca3-90fac88b2b9c))
-  (pad "MP" smd roundrect (at -3.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp e9cdf5f7-969d-47a6-9ee0-51b22544812a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B2B-PH-SM4-TB_1x02-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical.kicad_mod
index 2f4ff00d5..c6cc5744d 100644
--- a/Connector_JST.pretty/JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,57 +1,83 @@
-(footprint "JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B3B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 100aed41-8fa9-4603-9897-4ffcfdddf5ac)
   )
-  (fp_text value "JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c5b3c14e-04b6-4c0f-9f29-3058752220b8)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -4.975 0.75) (end 4.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.085 0.01) (end -5.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.085 0.86) (end -2.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.76 0.86) (end -2.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.085 0.01) (end 5.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.085 0.86) (end 2.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.085 -3.51) (end -5.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.085 -4.36) (end 5.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.085 -4.36) (end 5.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.975 -4.25) (end 4.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.975 0.75) (end -4.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.975 0.75) (end 4.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.75) (end -2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.25) (end -1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.25) (end -1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.75) (end -2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.75) (end -0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.25) (end 0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.25) (end 0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.75) (end -0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.75) (end 1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.25) (end 2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.25) (end 2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.75) (end 1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.7 -4.75) (end -5.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.7 3.75) (end 5.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.7 3.75) (end 5.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.7 -4.75) (end -5.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.5 0.75) (end -2 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0.042893) (end -1.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 4.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1536a31e-6c41-44d2-9178-fdf4ba2dc81d)
   )
-  (fp_line (start 5.085 -4.36) (end 5.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 21ac827b-cb64-4146-b829-9c1f5ba12cad))
-  (fp_line (start -5.085 -4.36) (end 5.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 33a649d9-11fb-4026-ae74-6e1367c0ea36))
-  (fp_line (start -5.085 0.86) (end -2.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 6243c931-92c2-40ff-80ab-cccabb1c76e7))
-  (fp_line (start -5.085 -3.51) (end -5.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 75d565e1-243b-40ec-979e-5a7e465a587b))
-  (fp_line (start -2.76 0.86) (end -2.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 96e14981-e7a2-4624-8dd0-1e9f1e1b1b79))
-  (fp_line (start 5.085 0.86) (end 2.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp bacba5d3-9817-46d2-9d57-3d49c3485282))
-  (fp_line (start -5.085 0.01) (end -5.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp c68fdb96-7da1-47e7-a2f0-4ed6578174eb))
-  (fp_line (start 5.085 0.01) (end 5.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp fbf4157e-dc22-4294-889a-c0b841c98de9))
-  (fp_line (start 5.7 3.75) (end 5.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 06817755-4cdc-4f81-9673-4e61d07ab8f3))
-  (fp_line (start -5.7 -4.75) (end -5.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 108a283b-3220-4c13-a6c6-3c07345b4c71))
-  (fp_line (start 5.7 -4.75) (end -5.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp bf1ab5c5-d4b3-454b-a9f6-210b10d78da0))
-  (fp_line (start -5.7 3.75) (end 5.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp c8f2665f-4f74-4b23-8202-36e0a6b4d3c3))
-  (fp_line (start 0.25 -2.25) (end 0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 21c6e721-a95b-4eab-9261-fb3c74988a35))
-  (fp_line (start -4.975 0.75) (end -4.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 40e2fd64-0cf2-4ec1-a20a-4d0b27758c48))
-  (fp_line (start -0.25 -2.25) (end 0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 4cbc37f5-6cd8-44ec-841d-27bd123d9b5a))
-  (fp_line (start 2.25 -2.75) (end 1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 53cfe109-90fe-4198-bb2b-ed8c92562b80))
-  (fp_line (start -2.5 0.75) (end -2 0.042893) (layer "F.Fab") (width 0.1) (tstamp 5e392bbc-df1f-48b9-ab1b-98d1d4dcaf66))
-  (fp_line (start -1.75 -2.25) (end -1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 606f3ef6-36ac-45f6-a023-ddaae9f91c85))
-  (fp_line (start -2.25 -2.25) (end -1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 61ded519-d9bf-4e04-ad56-a4e598d90d84))
-  (fp_line (start -0.25 -2.75) (end -0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6a02138e-0928-4ca0-b61e-167111aed928))
-  (fp_line (start -4.975 0.75) (end 4.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 7b5177ae-df9d-4f7d-9c89-2ed6c3bba34e))
-  (fp_line (start -2 0.042893) (end -1.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 8dec177d-a57c-4579-927f-1644392b018f))
-  (fp_line (start -1.75 -2.75) (end -2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 902650c4-661f-401f-854b-cd1a7a6c2416))
-  (fp_line (start -4.975 -4.25) (end 4.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 9fe57608-7280-48b1-abd7-688635e2b0b5))
-  (fp_line (start -2.25 -2.75) (end -2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp a133f0f2-7504-41e5-a007-bfb377fedf27))
-  (fp_line (start 1.75 -2.25) (end 2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b9a1a95c-8b34-48d5-82e3-aaa3a7132d86))
-  (fp_line (start 4.975 0.75) (end 4.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp c4f039bf-9878-4bbf-a108-4cfe83b1cef1))
-  (fp_line (start 1.75 -2.75) (end 1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp ce2b32f8-0e96-415d-af58-0e546043e316))
-  (fp_line (start 2.25 -2.25) (end 2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ea68432d-7e5b-4d72-b0ca-2a63cc9bf517))
-  (fp_line (start 0.25 -2.75) (end -0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp f24086c5-c01f-4969-8f05-b522d10a41c2))
-  (pad "1" smd roundrect (at -2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3f3dcb81-859b-43bf-a363-ef5cfd1df25f))
-  (pad "2" smd roundrect (at 0 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 239e08ef-e957-4e78-9ed1-f7822ae115e8))
-  (pad "3" smd roundrect (at 2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 78818dbe-a6cc-450b-b254-6b665ccfe415))
-  (pad "MP" smd roundrect (at -4.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp a1b401fd-74ef-4219-8ac5-1288fff3f7a5))
-  (pad "MP" smd roundrect (at 4.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp e9d77210-d1f6-4246-908d-844b13a529ed))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B3B-PH-SM4-TB_1x03-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical.kicad_mod
index 70632cd48..59bcb3534 100644
--- a/Connector_JST.pretty/JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,62 +1,92 @@
-(footprint "JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B4B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cf918463-3821-46d8-882d-19635117ed5f)
   )
-  (fp_text value "JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c5bfed5f-d29d-4172-b3c5-23b0a5a06078)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -5.975 0.75) (end 5.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.085 0.01) (end -6.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.085 0.86) (end -3.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.76 0.86) (end -3.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.085 0.01) (end 6.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.085 0.86) (end 3.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.085 -3.51) (end -6.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.085 -4.36) (end 6.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.085 -4.36) (end 6.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.975 -4.25) (end 5.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.975 0.75) (end -5.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.975 0.75) (end 5.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.75) (end -3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.25) (end -2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.25) (end -2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.75) (end -3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.75) (end 2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.25) (end 3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.25) (end 3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.75) (end 2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.7 -4.75) (end -6.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.7 3.75) (end 6.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.7 3.75) (end 6.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.7 -4.75) (end -6.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 0.75) (end -3 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 0.042893) (end -2.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 5.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp da07ee8f-b7ef-4ad0-ac2d-424b8d654782)
   )
-  (fp_line (start -6.085 0.86) (end -3.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 04b45b64-ce27-4ded-9b0e-a1ad3469b4ea))
-  (fp_line (start -6.085 0.01) (end -6.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 133bf11a-7fa2-45b0-9a4b-8bf9cc26a539))
-  (fp_line (start 6.085 0.86) (end 3.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 3133a089-80da-478c-a8d2-3f11411f8344))
-  (fp_line (start 6.085 0.01) (end 6.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 3f0d57e7-1187-402b-9065-a9d1e34ef7b9))
-  (fp_line (start 6.085 -4.36) (end 6.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 569aed64-8e66-4f39-a6b3-100bbfbb52dd))
-  (fp_line (start -3.76 0.86) (end -3.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 73fba12f-4306-4d58-a350-8a3e212b506e))
-  (fp_line (start -6.085 -3.51) (end -6.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 84d9c65f-1147-4851-80c1-d2144a878dfb))
-  (fp_line (start -6.085 -4.36) (end 6.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp e0a8426c-16dc-4317-bc27-8d404bcbb774))
-  (fp_line (start -6.7 3.75) (end 6.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 57032c8b-a5c5-426a-8e90-683fe25d060e))
-  (fp_line (start 6.7 3.75) (end 6.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 661f67fd-5af2-4597-9d23-b1e2328eb434))
-  (fp_line (start -6.7 -4.75) (end -6.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 99bab930-a2df-41e6-8171-d5273e618d6a))
-  (fp_line (start 6.7 -4.75) (end -6.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp aa896602-c807-4cc9-8baa-5c372a047198))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 053a24ed-17a6-4020-80b1-f2c030616f58))
-  (fp_line (start 2.75 -2.75) (end 2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 06e218b7-360a-43b8-afa8-6960cf916568))
-  (fp_line (start -5.975 0.75) (end 5.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 07ef6248-d35b-4877-8e8d-316e8abc03fa))
-  (fp_line (start -3.5 0.75) (end -3 0.042893) (layer "F.Fab") (width 0.1) (tstamp 173b8c2f-f8bc-4da6-b264-523f1d22e4f7))
-  (fp_line (start -2.75 -2.25) (end -2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1764f431-a7a2-427a-9b53-c98b270530b3))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 24701600-7294-40e8-bcea-2e81dff4b51e))
-  (fp_line (start -2.75 -2.75) (end -3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 28279d8c-9bdf-49d0-b3d7-c5a0f19c1c9b))
-  (fp_line (start 2.75 -2.25) (end 3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 35ae6976-ba9e-4e0c-8312-281c427838fe))
-  (fp_line (start -3.25 -2.75) (end -3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 44be7b8d-df6d-47cf-8b70-8636ca55ba73))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 45994bbc-8ccb-4cc8-98d3-a4ce6ebe7edd))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 478147a5-786d-41b9-8ccd-828073b4c05e))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5c422250-d0f7-4b4a-af1f-8d815cce1eea))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 8fa727a8-c2a4-48af-9afc-ace919b042bb))
-  (fp_line (start -3.25 -2.25) (end -2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp c86de109-0940-4b84-a98e-abb69ecc7bc4))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d416528e-0791-49e0-a8cd-dc5bd5dfb720))
-  (fp_line (start -3 0.042893) (end -2.5 0.75) (layer "F.Fab") (width 0.1) (tstamp d464a092-b8f7-4721-a0f8-81b06cd6a12c))
-  (fp_line (start 3.25 -2.75) (end 2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp d6b08821-4c5e-4361-ad58-d4e71cd8dd17))
-  (fp_line (start 5.975 0.75) (end 5.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp da448628-7ab2-4654-8186-34702de53f9a))
-  (fp_line (start -5.975 0.75) (end -5.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp e3a1dd8c-fde5-45fa-a117-f2859b56f11d))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e4412cec-d2e0-4735-b7da-614e6d5132b4))
-  (fp_line (start 3.25 -2.25) (end 3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp f5b5b5b5-c4f4-4ae5-878f-55d3860bb8dd))
-  (fp_line (start -5.975 -4.25) (end 5.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp f7bfdc38-7b08-4c40-b3df-bfea412e5bfa))
-  (pad "1" smd roundrect (at -3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9950ab4f-6633-4688-8aec-ba0c781e51fc))
-  (pad "2" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 732b4d7e-d3fb-497b-89a5-16832ae8ddee))
-  (pad "3" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5bc41baa-5d1d-4a68-a60d-6721924fb28f))
-  (pad "4" smd roundrect (at 3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp af4b66ce-a9b5-405d-b443-717f9369aa78))
-  (pad "MP" smd roundrect (at 5.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 13d81004-755c-4d7d-8e16-7f9075238196))
-  (pad "MP" smd roundrect (at -5.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 7fd8e605-6f0f-433b-971c-65dff5595860))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B4B-PH-SM4-TB_1x04-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical.kicad_mod
index d1bad01a0..d4092e692 100644
--- a/Connector_JST.pretty/JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,67 +1,101 @@
-(footprint "JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B5B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 887157a4-9b50-4129-a823-443db1bd901e)
   )
-  (fp_text value "JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5051b13-2945-43ca-a663-f71d70609141)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -6.975 0.75) (end 6.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.085 0.01) (end -7.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.085 0.86) (end -4.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.76 0.86) (end -4.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.085 0.01) (end 7.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.085 0.86) (end 4.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.085 -3.51) (end -7.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.085 -4.36) (end 7.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.085 -4.36) (end 7.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.975 -4.25) (end 6.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.975 0.75) (end -6.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.975 0.75) (end 6.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.75) (end -4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.25) (end -3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.25) (end -3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.75) (end -4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.75) (end -2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.25) (end -1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.25) (end -1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.75) (end -2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.75) (end -0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.25) (end 0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.25) (end 0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.75) (end -0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.75) (end 1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.25) (end 2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.25) (end 2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.75) (end 1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.75) (end 3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.25) (end 4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.25) (end 4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.75) (end 3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.7 -4.75) (end -7.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.7 3.75) (end 7.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.7 3.75) (end 7.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.7 -4.75) (end -7.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.5 0.75) (end -4 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0.042893) (end -3.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 6.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2671c3d7-f238-485a-9cfd-e9628f62f21b)
   )
-  (fp_line (start -7.085 0.86) (end -4.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 1bfa906d-2dcb-49d2-9985-8947baa8633f))
-  (fp_line (start -4.76 0.86) (end -4.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 5a4b8045-3486-417c-bca8-4c9c33189261))
-  (fp_line (start 7.085 0.01) (end 7.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 8b463676-aff8-4b4c-b729-5e463a4d6d7a))
-  (fp_line (start -7.085 0.01) (end -7.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 97087320-fb44-4b81-9b15-90cf477d2bf9))
-  (fp_line (start -7.085 -3.51) (end -7.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp b3a16386-2349-4502-9359-0c53c91efccc))
-  (fp_line (start 7.085 -4.36) (end 7.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp b46ddb6a-3213-48a4-b8b6-2c2fc1e9c675))
-  (fp_line (start 7.085 0.86) (end 4.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp ce8b1e25-09d4-49ed-993c-e720ae01043a))
-  (fp_line (start -7.085 -4.36) (end 7.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp f1e169f1-0bfb-4eef-9e48-2bcb725ee7a8))
-  (fp_line (start 7.7 -4.75) (end -7.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 009c94cf-19fa-44a2-9055-8ca69d3c79f1))
-  (fp_line (start -7.7 3.75) (end 7.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 20b4b848-785a-4ea6-9dc7-a30209ade2ff))
-  (fp_line (start -7.7 -4.75) (end -7.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 3560c56c-0446-4b50-b6a6-804e50c491f8))
-  (fp_line (start 7.7 3.75) (end 7.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 3c916f5f-232f-40ca-bdf8-275878c1449e))
-  (fp_line (start -6.975 0.75) (end 6.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 03b1e9d7-5f3e-4618-a7e0-6bb465a04487))
-  (fp_line (start 1.75 -2.75) (end 1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 223c54a2-5660-4ad6-93bb-da5a56c67f19))
-  (fp_line (start -6.975 -4.25) (end 6.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 2c7ed094-1bcc-47bc-aaf2-84a07a3aa56e))
-  (fp_line (start 0.25 -2.25) (end 0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 35f40cf1-e274-455c-9d31-3c6ae7599b0d))
-  (fp_line (start -1.75 -2.75) (end -2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 41b36838-66a2-4587-97c1-71efe46c329a))
-  (fp_line (start -4.5 0.75) (end -4 0.042893) (layer "F.Fab") (width 0.1) (tstamp 442e2f10-2adb-49f2-9fde-39a48207030b))
-  (fp_line (start 2.25 -2.25) (end 2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 53ea8dea-bb07-4aa6-b227-c4f1f8067507))
-  (fp_line (start -4 0.042893) (end -3.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 621e212d-4bb8-4407-8660-05d03eb25f40))
-  (fp_line (start -1.75 -2.25) (end -1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6bcbc28a-4e85-4c4d-9e6d-31bc851c7ae4))
-  (fp_line (start 4.25 -2.75) (end 3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6e2f20e9-264f-4458-ae74-c2205ab8e5d5))
-  (fp_line (start 1.75 -2.25) (end 2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 720ea253-a973-4b55-897c-8171fcdc9a18))
-  (fp_line (start -3.75 -2.75) (end -4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 74a84b28-0e2d-4b42-b03f-2b2cd5803fa9))
-  (fp_line (start 0.25 -2.75) (end -0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 74ba9419-0dcf-4618-ada4-146db144b70f))
-  (fp_line (start -0.25 -2.75) (end -0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 76dd659f-c7bf-403f-99e8-da2507260f9a))
-  (fp_line (start -4.25 -2.25) (end -3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp a462b662-d4e9-47f9-af26-b0b660ed14d7))
-  (fp_line (start -6.975 0.75) (end -6.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp ca2ce536-2f9c-492f-8136-4daf87debb3f))
-  (fp_line (start 2.25 -2.75) (end 1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp cb1c0813-e138-459a-a9fb-e77b0454e96c))
-  (fp_line (start -3.75 -2.25) (end -3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp cc972e61-250e-4a41-82b1-ff28ad9846a1))
-  (fp_line (start 6.975 0.75) (end 6.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp cd1c478f-e7e0-4bbd-b96a-f0d5dd458575))
-  (fp_line (start -0.25 -2.25) (end 0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d027a9af-8667-436d-b711-51fe45c7e8e3))
-  (fp_line (start -2.25 -2.75) (end -2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d1aee215-9ffa-4f55-8a85-7c98abf25f13))
-  (fp_line (start 3.75 -2.25) (end 4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d9f16a79-de30-422c-8c5f-6493c038b93d))
-  (fp_line (start -4.25 -2.75) (end -4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp da91a305-f099-4106-9baf-582e627f578d))
-  (fp_line (start 3.75 -2.75) (end 3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp dc499cfe-102a-45d5-bedd-efe5d9d1e965))
-  (fp_line (start 4.25 -2.25) (end 4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp e7161053-64d4-4376-8895-dc728979117b))
-  (fp_line (start -2.25 -2.25) (end -1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp f14d50cf-8e94-4512-a839-9b3b3bf2e9cd))
-  (pad "1" smd roundrect (at -4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c3218bc8-006b-44a8-90f9-32bbba15e69c))
-  (pad "2" smd roundrect (at -2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 06a02a57-a382-4d38-b0f2-d301a3b19db8))
-  (pad "3" smd roundrect (at 0 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3bc11f18-f3ea-4041-806d-0983811450ba))
-  (pad "4" smd roundrect (at 2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4efca8aa-6847-4594-bba5-ea44cec4bae2))
-  (pad "5" smd roundrect (at 4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7fbc963e-e911-4322-b7cb-240f46912603))
-  (pad "MP" smd roundrect (at 6.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 491cf08e-7871-427b-88cc-b0cce3bc2f9c))
-  (pad "MP" smd roundrect (at -6.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 8385bd77-dd02-4973-864a-e04acc4a28f8))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B5B-PH-SM4-TB_1x05-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical.kicad_mod
index 2cfa3e455..3421a8b8b 100644
--- a/Connector_JST.pretty/JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,72 +1,110 @@
-(footprint "JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B6B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 79c08e8b-fe5a-41a5-89a8-b4e530cc70e9)
   )
-  (fp_text value "JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e1cf665a-a5c6-4e79-b757-f043135c27f5)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -7.975 0.75) (end 7.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.085 0.01) (end -8.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.085 0.86) (end -5.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.76 0.86) (end -5.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.085 0.01) (end 8.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.085 0.86) (end 5.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.085 -3.51) (end -8.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.085 -4.36) (end 8.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.085 -4.36) (end 8.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.975 -4.25) (end 7.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.975 0.75) (end -7.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.975 0.75) (end 7.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.75) (end -5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.25) (end -4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.25) (end -4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.75) (end -5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.75) (end -3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.25) (end -2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.25) (end -2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.75) (end -3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.75) (end 2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.25) (end 3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.25) (end 3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.75) (end 2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.75) (end 4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.25) (end 5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.25) (end 5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.75) (end 4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.7 -4.75) (end -8.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.7 3.75) (end 8.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.7 3.75) (end 8.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.7 -4.75) (end -8.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 0.75) (end -5 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 0.042893) (end -4.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 7.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 01ada754-2cbb-4e4f-a788-fe395fba988c)
   )
-  (fp_line (start -8.085 -3.51) (end -8.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 3a2efc62-a3ad-40a7-b8be-d8442900e651))
-  (fp_line (start -8.085 0.86) (end -5.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 5c9d7263-1abc-47a9-be4e-f46ff98f6c95))
-  (fp_line (start 8.085 -4.36) (end 8.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 61da0436-a6d8-4ab2-a9e2-0419f227026f))
-  (fp_line (start 8.085 0.86) (end 5.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 62d7db22-2d50-4f5a-b605-e33597dfb076))
-  (fp_line (start -5.76 0.86) (end -5.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 8c79d083-148f-49b5-96f1-85d5d420259e))
-  (fp_line (start -8.085 0.01) (end -8.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp a6898716-d9d4-4223-bb5d-31e24ba98e12))
-  (fp_line (start 8.085 0.01) (end 8.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp b0923d4f-3d37-48f6-9218-c3c59291b903))
-  (fp_line (start -8.085 -4.36) (end 8.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp eea0dab0-7a43-4827-80e4-f9c3773e60f0))
-  (fp_line (start 8.7 3.75) (end 8.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 45fcded3-7724-47e7-8c7f-56a9f27e2807))
-  (fp_line (start 8.7 -4.75) (end -8.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 691ddc4a-e5e1-4de3-b641-43d8196b1696))
-  (fp_line (start -8.7 3.75) (end 8.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 70eb43ef-3ff7-46f9-8202-dbf661ea685e))
-  (fp_line (start -8.7 -4.75) (end -8.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp c5441a4c-724c-421e-934e-186ec6faa142))
-  (fp_line (start 4.75 -2.25) (end 5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 040b2bde-3d95-4374-b2e1-6e107b2682bf))
-  (fp_line (start -2.75 -2.75) (end -3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 126fa015-164e-4daa-bf52-185cad4d6a47))
-  (fp_line (start 4.75 -2.75) (end 4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 1423c404-7038-44fd-9870-70292ce6e83b))
-  (fp_line (start 5.25 -2.25) (end 5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 15ae9915-8c55-4702-9764-80f57d4f5b49))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 224d0128-9ac8-44de-ad9d-785a9d894354))
-  (fp_line (start 7.975 0.75) (end 7.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 28a3708b-a027-4dff-82df-a2be91d062f9))
-  (fp_line (start -4.75 -2.75) (end -5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 2ce1d6d6-a51e-4c67-acb7-126a51466942))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 325ae43a-079f-409e-8d97-7add4e03f7ea))
-  (fp_line (start -7.975 0.75) (end 7.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 4d413fb9-a6b2-49ff-9c7c-56a8b8ec8a88))
-  (fp_line (start 2.75 -2.25) (end 3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6a8b355e-4901-49ac-bd0c-8a337146dd92))
-  (fp_line (start -3.25 -2.75) (end -3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6dd94d51-ce7e-42a1-ac9c-81e94e445c41))
-  (fp_line (start 2.75 -2.75) (end 2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 766fd41d-ddcf-43f1-8d5d-27cb1d42a56c))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 7a64ce2e-5880-4221-b058-ba6978830a28))
-  (fp_line (start 3.25 -2.25) (end 3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7a9c3064-efd3-494c-8313-7ca9ae7dc8c4))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 881d7b78-5be7-44f9-b18d-f81fa91e05e7))
-  (fp_line (start -5.25 -2.75) (end -5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8867da39-2362-4cf6-b09d-ab33d8aa39ac))
-  (fp_line (start -5 0.042893) (end -4.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 8cffa34c-8c02-447b-8859-99ab7a6b6722))
-  (fp_line (start -3.25 -2.25) (end -2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 90a20504-87d9-4250-9b4f-61a34bb4bae6))
-  (fp_line (start -5.25 -2.25) (end -4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 921bca5f-c862-42f0-86d0-1e2fd6bddba6))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp acb2b39b-3e5c-4368-b7c6-df9f2b7d1f25))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp b598a2ca-2559-450c-af72-a7566edc189f))
-  (fp_line (start -2.75 -2.25) (end -2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp c27dcb97-a8b0-4a0a-bc01-2ee2cdaa7ac1))
-  (fp_line (start -7.975 0.75) (end -7.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp c495326e-6d73-4cf5-965a-4b95a73a1375))
-  (fp_line (start 3.25 -2.75) (end 2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp cec92e84-9609-4a78-b202-f6a04e2c3c3a))
-  (fp_line (start -5.5 0.75) (end -5 0.042893) (layer "F.Fab") (width 0.1) (tstamp dc0bd3b5-3a74-4b11-af9b-069368b707ee))
-  (fp_line (start -4.75 -2.25) (end -4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e11ffae4-95ee-435f-9e81-0bc6a9f6e978))
-  (fp_line (start -7.975 -4.25) (end 7.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp e4a97026-ae6b-4fc4-9ea4-2dca358f5913))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp eb7a66c7-c4f2-4715-a73a-c51b435987bd))
-  (fp_line (start 5.25 -2.75) (end 4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f1160d63-283c-4248-89f1-6586beb856e2))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ff4d1b65-8ab7-4cc8-9e0e-f30f37c47073))
-  (pad "1" smd roundrect (at -5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c8d266c2-ec77-424c-8e9d-ed7a87c5fa31))
-  (pad "2" smd roundrect (at -3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp beb43edc-2d76-4ce9-b8cb-22b0cd42e3f7))
-  (pad "3" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 054ef71d-ad58-43ac-82f5-e056d9037af6))
-  (pad "4" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3778a0ab-e59c-49e8-b4e2-e2a9afc3d137))
-  (pad "5" smd roundrect (at 3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d26912ad-f929-4239-a4e8-0034d0c959c8))
-  (pad "6" smd roundrect (at 5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ea2481ef-e061-40ef-93d2-09998efa337d))
-  (pad "MP" smd roundrect (at 7.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp db8e2ef8-28b0-4b9e-bc69-d5b1cc170a19))
-  (pad "MP" smd roundrect (at -7.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp fe16025c-5464-4b78-8257-6b4e6797f343))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B6B-PH-SM4-TB_1x06-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical.kicad_mod
index c500587f8..d3a4cd297 100644
--- a/Connector_JST.pretty/JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,77 +1,119 @@
-(footprint "JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B7B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 083ac57c-7fd1-4274-98e4-2bb1feffa84f)
   )
-  (fp_text value "JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 185a445b-c867-4993-bafb-00da87137154)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -8.975 0.75) (end 8.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.085 0.01) (end -9.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.085 0.86) (end -6.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.76 0.86) (end -6.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.085 0.01) (end 9.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.085 0.86) (end 6.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.085 -3.51) (end -9.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.085 -4.36) (end 9.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.085 -4.36) (end 9.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.975 -4.25) (end 8.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.975 0.75) (end -8.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.975 0.75) (end 8.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.75) (end -6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.25) (end -5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.25) (end -5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.75) (end -6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.75) (end -4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.25) (end -3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.25) (end -3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.75) (end -4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.75) (end -2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.25) (end -1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.25) (end -1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.75) (end -2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.75) (end -0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.25) (end 0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.25) (end 0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.75) (end -0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.75) (end 1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.25) (end 2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.25) (end 2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.75) (end 1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.75) (end 3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.25) (end 4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.25) (end 4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.75) (end 3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.75) (end 5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.25) (end 6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.25) (end 6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.75) (end 5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.7 -4.75) (end -9.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.7 3.75) (end 9.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.7 3.75) (end 9.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.7 -4.75) (end -9.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 0.75) (end -6 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 0.042893) (end -5.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 8.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 23141e76-740a-4950-a5b8-bd862e5f7214)
   )
-  (fp_line (start -9.085 -4.36) (end 9.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 0e5d5c8d-409f-4f44-b75f-59ad63ae38fa))
-  (fp_line (start -9.085 0.01) (end -9.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp 156c1d4b-bca2-4973-a122-af986c0bd91f))
-  (fp_line (start 9.085 0.86) (end 6.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 1a3f95e6-c6a8-4727-9e6a-79fcc21af841))
-  (fp_line (start -9.085 0.86) (end -6.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 2b07678e-3744-4335-8fd9-3ae1e0f116f7))
-  (fp_line (start 9.085 -4.36) (end 9.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 7c36d83a-4380-41ec-85c8-358a0906237a))
-  (fp_line (start -6.76 0.86) (end -6.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp c9eb9745-33c1-40ae-a332-6d66797d51f0))
-  (fp_line (start 9.085 0.01) (end 9.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp cfa1dcd5-cb4d-4765-b885-c212f17ea028))
-  (fp_line (start -9.085 -3.51) (end -9.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp fe15e1d4-76bb-403f-a891-bc40e292a8d9))
-  (fp_line (start -9.7 3.75) (end 9.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 400e770a-9245-4d2d-a633-c284b70209b4))
-  (fp_line (start -9.7 -4.75) (end -9.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 996252f6-ad4f-4dd0-af28-a9ac976f208b))
-  (fp_line (start 9.7 -4.75) (end -9.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp b05ecf21-40dc-4908-a8a3-0b19348b15fa))
-  (fp_line (start 9.7 3.75) (end 9.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp e962ae4b-0e29-4da8-85cf-809e77941a3f))
-  (fp_line (start -8.975 0.75) (end -8.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 07912c9b-8657-4797-a083-907502b44e40))
-  (fp_line (start 2.25 -2.25) (end 2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 1488c082-988a-4d82-a2dd-3e24596a1d9a))
-  (fp_line (start -6 0.042893) (end -5.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 1fd89210-e797-419f-9773-da2715cb8fb3))
-  (fp_line (start -5.75 -2.25) (end -5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 212b7bdd-d996-43c6-a5c5-29c102a37a73))
-  (fp_line (start -1.75 -2.75) (end -2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 2398e8c3-4674-47aa-9547-c4196b29cf7c))
-  (fp_line (start -6.5 0.75) (end -6 0.042893) (layer "F.Fab") (width 0.1) (tstamp 2ab903ee-e787-4a7a-bd55-cded89134629))
-  (fp_line (start 4.25 -2.25) (end 4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 30725d68-7ed3-4968-bdee-028810459181))
-  (fp_line (start -8.975 -4.25) (end 8.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 4e063047-8f6f-4bd9-ae7e-55f3888b6ae6))
-  (fp_line (start 6.25 -2.25) (end 6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 559ca26c-4b0c-42d0-a1e0-421302900e2a))
-  (fp_line (start -2.25 -2.25) (end -1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5f633196-e9f1-44a0-89bc-c8ecb4c94a2b))
-  (fp_line (start -6.25 -2.25) (end -5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 71c80d16-eb5f-49a3-aba6-18da20187d7b))
-  (fp_line (start 5.75 -2.25) (end 6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 756e46e6-724c-4fdd-8108-5c7e3da21f0e))
-  (fp_line (start -2.25 -2.75) (end -2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 77306e5c-9fc5-4bf0-ab8a-80cc9094b0af))
-  (fp_line (start 0.25 -2.75) (end -0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 832d6737-4d4a-4ef8-9623-b57edd531282))
-  (fp_line (start 5.75 -2.75) (end 5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 8a1b6bfd-993f-474e-a85d-47fc39c5419f))
-  (fp_line (start 4.25 -2.75) (end 3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 8e9efe6d-a3a1-430a-a2ec-a7d8d2c45a38))
-  (fp_line (start 1.75 -2.75) (end 1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp a4aa5c91-775e-4504-a606-6abf7c770020))
-  (fp_line (start -8.975 0.75) (end 8.975 0.75) (layer "F.Fab") (width 0.1) (tstamp ab90d77b-9392-4a1d-9e13-245efe8c2385))
-  (fp_line (start -4.25 -2.25) (end -3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp b23a8d72-b98e-40bc-9c31-e29d7c346bf2))
-  (fp_line (start 6.25 -2.75) (end 5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp b6b5ccf4-c1ab-4236-a70c-670c5842dc8e))
-  (fp_line (start -3.75 -2.75) (end -4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp b9f2d508-3f3f-4dd7-9fa1-5ab2ba63b841))
-  (fp_line (start 3.75 -2.75) (end 3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp bd745566-fc9f-437d-89fe-a254eba291d2))
-  (fp_line (start -1.75 -2.25) (end -1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp c24252f0-f30b-4467-bbc9-988d0d03bf28))
-  (fp_line (start -4.25 -2.75) (end -4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d00b1021-341e-45dd-8875-8159bdcdd9a4))
-  (fp_line (start -6.25 -2.75) (end -6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp d1c9d8c8-7639-41c4-9a59-fcceeb8dba2c))
-  (fp_line (start 0.25 -2.25) (end 0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d89f5f96-5867-41ad-ae2f-3a032fd9de4b))
-  (fp_line (start 1.75 -2.25) (end 2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp dabf0d77-e99b-460e-b238-0746e4317bab))
-  (fp_line (start -0.25 -2.25) (end 0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp e07f1535-b410-4c91-9629-1c75b28b6189))
-  (fp_line (start 8.975 0.75) (end 8.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp e13f39f3-0aed-4bd7-86b9-5de5ab31bd63))
-  (fp_line (start -3.75 -2.25) (end -3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp f96f969c-74aa-4ad1-9a49-d434960d33b1))
-  (fp_line (start -0.25 -2.75) (end -0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp fa8cad0b-8be5-4bd1-8d2b-f060624b7a1b))
-  (fp_line (start 3.75 -2.25) (end 4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp fd52813b-9a45-4925-96e5-3396f5c0f073))
-  (fp_line (start -5.75 -2.75) (end -6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp fe258642-bfa6-42b9-bcae-cd4b3704acf9))
-  (fp_line (start 2.25 -2.75) (end 1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp ff5d263b-b9ec-4046-9ea0-2bbc84078e6e))
-  (pad "1" smd roundrect (at -6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f870759c-1878-4992-b155-455df8f5916b))
-  (pad "2" smd roundrect (at -4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d504004a-8067-40b2-946c-4db64cd04581))
-  (pad "3" smd roundrect (at -2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ecffa709-a86f-40ad-abef-79dd5e2e72ba))
-  (pad "4" smd roundrect (at 0 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8eafa867-65b8-4a8b-a7b4-2b7e081e9124))
-  (pad "5" smd roundrect (at 2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8a4e196c-e02f-43af-8e3c-2868c6fde74c))
-  (pad "6" smd roundrect (at 4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 67c71e5a-cffe-4674-b774-35860f98fb93))
-  (pad "7" smd roundrect (at 6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 87a84142-71c2-4b75-9906-18917323bdc7))
-  (pad "MP" smd roundrect (at 8.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 90db0587-2426-49a5-8fa5-3f640d868f54))
-  (pad "MP" smd roundrect (at -8.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp cc8d1da7-6328-409b-8a5c-fceca26389ee))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B7B-PH-SM4-TB_1x07-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical.kicad_mod
index 5f09d096f..a67640e2d 100644
--- a/Connector_JST.pretty/JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,82 +1,128 @@
-(footprint "JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B8B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d3c0ecdd-4b3c-4250-9ce0-6ab233da4bd4)
   )
-  (fp_text value "JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f97ea498-2463-44f8-a094-d6af67dbb20c)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -9.975 0.75) (end 9.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.085 0.01) (end -10.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.085 0.86) (end -7.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.76 0.86) (end -7.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.085 0.01) (end 10.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.085 0.86) (end 7.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.085 -3.51) (end -10.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.085 -4.36) (end 10.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.085 -4.36) (end 10.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.975 -4.25) (end 9.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.975 0.75) (end -9.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.975 0.75) (end 9.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.75) (end -7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -2.25) (end -6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.25) (end -6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.75) (end -7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.75) (end -5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.25) (end -4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.25) (end -4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -2.75) (end -5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.75) (end -3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -2.25) (end -2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.25) (end -2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -2.75) (end -3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.75) (end -1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -2.25) (end -0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.25) (end -0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -2.75) (end -1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.75) (end 0.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.75 -2.25) (end 1.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.25) (end 1.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -2.75) (end 0.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.75) (end 2.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -2.25) (end 3.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.25) (end 3.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -2.75) (end 2.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.75) (end 4.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -2.25) (end 5.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.25) (end 5.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.75) (end 4.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.75) (end 6.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.25) (end 7.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.25) (end 7.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -2.75) (end 6.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.7 -4.75) (end -10.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.7 3.75) (end 10.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.7 3.75) (end 10.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.7 -4.75) (end -10.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.5 0.75) (end -7 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 0.042893) (end -6.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 5 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 7 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 9.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3dac6b10-6bf4-4778-9f79-3318340e94fb)
   )
-  (fp_line (start -10.085 0.86) (end -7.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 18ac4a01-6983-43e1-8c44-7290e5ac1035))
-  (fp_line (start -7.76 0.86) (end -7.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp 2102277c-f932-480d-8ab8-d55bf7ddccdc))
-  (fp_line (start -10.085 -3.51) (end -10.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 7ee3d0e0-27d2-48ca-8905-078ef3683f61))
-  (fp_line (start -10.085 0.01) (end -10.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp c8abcaa2-ed61-4fb2-9e82-7f4b0d0bf616))
-  (fp_line (start 10.085 -4.36) (end 10.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp cc1ba510-1558-45a0-97cf-3490d9323276))
-  (fp_line (start -10.085 -4.36) (end 10.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp e290ebfd-4b12-4212-ac33-8c48197b3023))
-  (fp_line (start 10.085 0.86) (end 7.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp f8b9f99f-9c40-47d0-b9eb-3d174a13e22d))
-  (fp_line (start 10.085 0.01) (end 10.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp fa77f155-35e0-4c61-ad1a-87edb3decaef))
-  (fp_line (start 10.7 3.75) (end 10.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 2912c1dc-4ce0-4521-9086-d8082b755869))
-  (fp_line (start 10.7 -4.75) (end -10.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp 577a3a4d-61d8-4edc-ae8b-367ee524b1ae))
-  (fp_line (start -10.7 3.75) (end 10.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp a3d4f6bb-a568-47a9-b0f2-cd448ea465d0))
-  (fp_line (start -10.7 -4.75) (end -10.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp e622f2dc-14a3-4d8a-a5a2-292ac548245e))
-  (fp_line (start 1.25 -2.25) (end 1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 0091859d-6cc2-4159-bfb1-a52481cef5fb))
-  (fp_line (start -3.25 -2.25) (end -2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 0c71928a-1f98-47d4-a29e-c35c05a83910))
-  (fp_line (start 9.975 0.75) (end 9.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 13b33bd0-b060-4ecb-832b-43fd92c3b7f8))
-  (fp_line (start 2.75 -2.25) (end 3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 1b6a5171-1062-42d4-8027-f72a2e751420))
-  (fp_line (start 0.75 -2.25) (end 1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 203d7d55-ff01-4705-b02b-5ef8e44aedc2))
-  (fp_line (start 4.75 -2.25) (end 5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 21280dc6-869e-4467-a3f3-70e355dc7a8f))
-  (fp_line (start -7.5 0.75) (end -7 0.042893) (layer "F.Fab") (width 0.1) (tstamp 281be0ce-ce8a-4dcc-b278-2df7328c87b6))
-  (fp_line (start -9.975 0.75) (end -9.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 2dd9d083-d45f-446a-af2b-c029c9eda1ad))
-  (fp_line (start 0.75 -2.75) (end 0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 2dfcd5ef-cc7d-48df-a6cc-845f5ce79f7c))
-  (fp_line (start 1.25 -2.75) (end 0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 38a69081-f613-4d8b-aa8c-861d3142ad03))
-  (fp_line (start 5.25 -2.75) (end 4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 3c1fb9ab-f560-462e-90d1-0db204951872))
-  (fp_line (start 3.25 -2.75) (end 2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 40265818-6a94-4608-aa3b-6f5a90523618))
-  (fp_line (start -9.975 0.75) (end 9.975 0.75) (layer "F.Fab") (width 0.1) (tstamp 40310d69-948f-4399-8a1d-960ab9efed60))
-  (fp_line (start 2.75 -2.75) (end 2.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5b08d2af-11dc-4278-b216-7b7c196c06df))
-  (fp_line (start -6.75 -2.75) (end -7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6a8a0f55-37ae-4c53-b2fd-76ae7b7db99e))
-  (fp_line (start -9.975 -4.25) (end 9.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 6c5cb5b2-f332-4ffa-b0ac-eeab0d2a79d8))
-  (fp_line (start -7 0.042893) (end -6.5 0.75) (layer "F.Fab") (width 0.1) (tstamp 77f8a1f5-d5ae-4ce8-af68-9fc1b2aa79dd))
-  (fp_line (start 6.75 -2.25) (end 7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 84bd6c52-a5d3-4923-be68-0f4cba918b2f))
-  (fp_line (start 3.25 -2.25) (end 3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 8648b2a2-3069-4e72-abf5-7d11e4e28775))
-  (fp_line (start 6.75 -2.75) (end 6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 9095d9e7-6e8a-44dd-98cf-339be073774a))
-  (fp_line (start -1.25 -2.75) (end -1.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 95280baf-e8c7-464f-a493-a7af99930770))
-  (fp_line (start -1.25 -2.25) (end -0.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 989642f6-caea-4305-b1c3-bf0dd57f7fe2))
-  (fp_line (start -5.25 -2.25) (end -4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp a06826dd-2d59-4303-9a32-31e6a23eed76))
-  (fp_line (start -0.75 -2.75) (end -1.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp a7936b3b-abba-4732-81db-7b6fddd1bfdb))
-  (fp_line (start -2.75 -2.25) (end -2.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp a7aeb781-4926-4658-ae5c-fc2939f0292f))
-  (fp_line (start -4.75 -2.75) (end -5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ac458f44-e58d-48b3-a801-67e21364902b))
-  (fp_line (start -5.25 -2.75) (end -5.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b3f0f6f7-5cbd-499d-9971-493970119347))
-  (fp_line (start -4.75 -2.25) (end -4.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp b52f0199-26cf-44c0-84d9-0ff876f547b6))
-  (fp_line (start -7.25 -2.75) (end -7.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp b954e1be-6dd0-4b82-b4e5-ccc7ad8ef45a))
-  (fp_line (start -7.25 -2.25) (end -6.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp b9e4b3ef-1548-441e-be3d-7164d742189c))
-  (fp_line (start 7.25 -2.75) (end 6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp c2a463b3-2522-4afa-9c99-9ec58fcc323c))
-  (fp_line (start 4.75 -2.75) (end 4.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp c598d3b2-3165-4127-96a2-37ab194e09fe))
-  (fp_line (start 7.25 -2.25) (end 7.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp c6911585-5082-42bf-a652-954a933d4cf7))
-  (fp_line (start 5.25 -2.25) (end 5.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d1ef496c-2b60-4f99-ae6c-2a91fbba9999))
-  (fp_line (start -2.75 -2.75) (end -3.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp d20f3188-3a62-4474-b5fd-9afb334ce112))
-  (fp_line (start -3.25 -2.75) (end -3.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp dd211297-8f0e-4606-aa0f-ad107659f489))
-  (fp_line (start -6.75 -2.25) (end -6.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e787c772-752c-4eef-9094-6c1ea964cd7a))
-  (fp_line (start -0.75 -2.25) (end -0.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp fef529c3-30a8-49f9-86a1-b429d62f7f2c))
-  (pad "1" smd roundrect (at -7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 554bde66-1424-40c3-a78b-9cc65d40241a))
-  (pad "2" smd roundrect (at -5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f9caae6-6c46-4aba-8f1d-307199fa142e))
-  (pad "3" smd roundrect (at -3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9fbe5bb5-8a0f-4ec7-b157-944b55db69f3))
-  (pad "4" smd roundrect (at -1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9fbba417-b589-4d5f-9878-19f1db9fdc0a))
-  (pad "5" smd roundrect (at 1 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fbb3ef63-25e1-4e3f-a732-e17a93fac448))
-  (pad "6" smd roundrect (at 3 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 723201da-cd02-45a9-9fe9-42bd4c5c0308))
-  (pad "7" smd roundrect (at 5 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0f521a92-992c-40b6-8bcf-3f8cfc940a98))
-  (pad "8" smd roundrect (at 7 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a42e3318-b7ff-4b0d-8891-4b82741e64ba))
-  (pad "MP" smd roundrect (at 9.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 4601d833-633c-40aa-a9b7-0dfe30a01eeb))
-  (pad "MP" smd roundrect (at -9.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp f4836f14-0e84-4e59-b141-c4b3f4fbb5a4))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B8B-PH-SM4-TB_1x08-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical.kicad_mod
index 7c508eb4d..09edb7efa 100644
--- a/Connector_JST.pretty/JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical.kicad_mod
@@ -1,87 +1,137 @@
-(footprint "JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, B9B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH side entry")
+  (tags "connector JST PH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.45) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.45) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ef859d48-51bc-4ef2-94a6-f940666316cf)
   )
-  (fp_text value "JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical" (at 0 4.45) (layer "F.Fab")
+  (fp_text value JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical (at 0 4.45) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8d548b54-c193-483b-a442-776132b5ab61)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1) (layer "F.Fab")
+  (fp_line (start -10.975 0.75) (end 10.975 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.085 0.01) (end -11.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.085 0.86) (end -8.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.76 0.86) (end -8.76 3.25)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.085 0.01) (end 11.085 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.085 0.86) (end 8.76 0.86)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.085 -3.51) (end -11.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.085 -4.36) (end 11.085 -4.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.085 -4.36) (end 11.085 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.975 -4.25) (end 10.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.975 0.75) (end -10.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.975 0.75) (end 10.975 -4.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.75) (end -8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.25) (end -7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.25) (end -7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -2.75) (end -8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.75) (end -6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.25) (end -5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.25) (end -5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -2.75) (end -6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.75) (end -4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -2.25) (end -3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.25) (end -3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.75) (end -4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.75) (end -2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.25) (end -1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.25) (end -1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -2.75) (end -2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.75) (end -0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -2.25) (end 0.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.25) (end 0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -2.75) (end -0.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.75) (end 1.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -2.25) (end 2.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.25) (end 2.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -2.75) (end 1.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.75) (end 3.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.25) (end 4.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.25) (end 4.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -2.75) (end 3.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.75) (end 5.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -2.25) (end 6.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.25) (end 6.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -2.75) (end 5.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.75) (end 7.75 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -2.25) (end 8.25 -2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.25) (end 8.25 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.75) (end 7.75 -2.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.7 -4.75) (end -11.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.7 3.75) (end 11.7 3.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.7 3.75) (end 11.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.7 -4.75) (end -11.7 -4.75)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.5 0.75) (end -8 0.042893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 0.042893) (end -7.5 0.75)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 4 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 6 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 8 0.5) (size 1 5.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (pad MP smd roundrect (at 10.4 -1.75) (size 1.6 3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15625))
+  (fp_text user ${REFERENCE} (at 0 -1) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 98d38715-c1e5-492d-831a-9c4956cb2a7e)
   )
-  (fp_line (start -11.085 -3.51) (end -11.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp 3cd1fc6e-c881-42ef-987a-29994fae89d6))
-  (fp_line (start -11.085 0.86) (end -8.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 52cbb58c-0cf5-41cb-94ff-0dde65ac1a54))
-  (fp_line (start 11.085 0.86) (end 8.76 0.86) (layer "F.SilkS") (width 0.12) (tstamp 8564f2eb-2c98-441c-8bde-222ab43973e4))
-  (fp_line (start -11.085 0.01) (end -11.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp bcdf39e3-a194-4e28-987b-fd8898effa8b))
-  (fp_line (start 11.085 -4.36) (end 11.085 -3.51) (layer "F.SilkS") (width 0.12) (tstamp c2374416-4f55-47b8-aa2e-c263ac3bce74))
-  (fp_line (start -11.085 -4.36) (end 11.085 -4.36) (layer "F.SilkS") (width 0.12) (tstamp d1c599cb-c9ad-445f-92a4-a9f03e00b876))
-  (fp_line (start -8.76 0.86) (end -8.76 3.25) (layer "F.SilkS") (width 0.12) (tstamp dc5bbaa6-8ae8-4de6-bc5c-a9356a4a217b))
-  (fp_line (start 11.085 0.01) (end 11.085 0.86) (layer "F.SilkS") (width 0.12) (tstamp f53491a7-0f49-46e1-9c35-9e1f383c8406))
-  (fp_line (start -11.7 3.75) (end 11.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp 6c2a20a3-d052-415b-b658-cbd480647d5c))
-  (fp_line (start 11.7 -4.75) (end -11.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp b41315d5-7f7b-4fb1-b2a5-6d21441cdf06))
-  (fp_line (start 11.7 3.75) (end 11.7 -4.75) (layer "F.CrtYd") (width 0.05) (tstamp ddc65da6-3317-438f-a3f5-0a59880d1e8d))
-  (fp_line (start -11.7 -4.75) (end -11.7 3.75) (layer "F.CrtYd") (width 0.05) (tstamp e6a89a07-45a8-4f31-ae42-6119fa5797a9))
-  (fp_line (start 5.75 -2.75) (end 5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 1d5ef871-746f-45f4-8afe-3bc265346777))
-  (fp_line (start -8.5 0.75) (end -8 0.042893) (layer "F.Fab") (width 0.1) (tstamp 22086b51-ebf5-465f-b505-11335d41df32))
-  (fp_line (start -7.75 -2.25) (end -7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 24072e2e-84e5-481d-8ea2-991c036de083))
-  (fp_line (start -3.75 -2.25) (end -3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 261170cf-c4e5-495e-a898-b7e5b99a480b))
-  (fp_line (start -2.25 -2.25) (end -1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 27553d79-4ad0-4745-89c6-9ebea623c335))
-  (fp_line (start 7.75 -2.75) (end 7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 315f4cd4-aca2-4bc8-9c8a-6fb5bdb160ae))
-  (fp_line (start -4.25 -2.75) (end -4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 375d7b92-8416-4302-9bfe-655546d0462e))
-  (fp_line (start 3.75 -2.25) (end 4.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 49b4c0b2-7479-466e-963e-1f4aaf80e0e6))
-  (fp_line (start -3.75 -2.75) (end -4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 56777143-8f47-4b44-8341-57dd6b0d6d6f))
-  (fp_line (start 2.25 -2.25) (end 2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 56e2b33b-650f-469b-9588-2de00bd4494d))
-  (fp_line (start 5.75 -2.25) (end 6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5747deb5-72e7-4333-bf6c-0f741978b756))
-  (fp_line (start -10.975 0.75) (end -10.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 5b33940b-0c7b-418c-ba30-d6057e35340a))
-  (fp_line (start 1.75 -2.25) (end 2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 5b88a1ba-0a09-4e19-b921-33f872b4ea6d))
-  (fp_line (start 10.975 0.75) (end 10.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp 62a6cddd-e5a0-4ae6-a5c2-8163f31e152b))
-  (fp_line (start 8.25 -2.25) (end 8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 62d5cade-4ef8-487f-b838-df1c0a937901))
-  (fp_line (start 4.25 -2.25) (end 4.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6407b8f8-0c16-4028-b932-b31fe35a3bb3))
-  (fp_line (start 8.25 -2.75) (end 7.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 656be514-c9b3-46a8-8937-37963528f250))
-  (fp_line (start 6.25 -2.75) (end 5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 6b58e5ed-5ddd-45c6-a22c-294d3c132aa6))
-  (fp_line (start -4.25 -2.25) (end -3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 6b7df290-58fa-4c0a-a71a-3cfebafcfbf3))
-  (fp_line (start 4.25 -2.75) (end 3.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp 7ca1e9ee-1fdf-4ffd-8b94-653ce57baadb))
-  (fp_line (start 1.75 -2.75) (end 1.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp 87b45e3a-3213-4808-aaef-6c47d42f9f04))
-  (fp_line (start -0.25 -2.25) (end 0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 89cee2dd-39b5-49ea-a70c-aa0da02b3229))
-  (fp_line (start -8.25 -2.75) (end -8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp 91a670bd-ca3f-4bbe-9323-cd7a0584c839))
-  (fp_line (start -5.75 -2.25) (end -5.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp a332bf73-149f-4040-92a7-bc7b2865132f))
-  (fp_line (start -7.75 -2.75) (end -8.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp a42fe0ed-9359-47fe-aff4-837a97e12660))
-  (fp_line (start -8.25 -2.25) (end -7.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp a7c2a2d8-8bc3-4dd0-ba52-c4f6b7882c54))
-  (fp_line (start -6.25 -2.75) (end -6.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp ab8d7df0-727d-4e48-9ca8-ed7fd4c441a8))
-  (fp_line (start -1.75 -2.25) (end -1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp abfd8ec8-3399-4d8e-b6fc-b3f90376feae))
-  (fp_line (start -8 0.042893) (end -7.5 0.75) (layer "F.Fab") (width 0.1) (tstamp ae2bfc15-e9c2-4c7b-83ad-be4047dcbb52))
-  (fp_line (start -6.25 -2.25) (end -5.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp ae57643c-84d2-4ae6-9737-bd56978a9215))
-  (fp_line (start 0.25 -2.75) (end -0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp b1a09f69-8010-49a7-8a59-f2adcf615235))
-  (fp_line (start -1.75 -2.75) (end -2.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp c05485bd-706c-4a55-ac6a-5b117937538c))
-  (fp_line (start -0.25 -2.75) (end -0.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp c60f1f61-64c2-41c5-8998-1f5d29bdc74d))
-  (fp_line (start -2.25 -2.75) (end -2.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp c877dff7-c38c-4653-a719-780676118c9a))
-  (fp_line (start 6.25 -2.25) (end 6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp cec7d2ac-2edc-4c68-8fef-9bcc294a481c))
-  (fp_line (start -10.975 0.75) (end 10.975 0.75) (layer "F.Fab") (width 0.1) (tstamp d57c6ddd-2e0b-47c0-97af-f9828af6a32b))
-  (fp_line (start -10.975 -4.25) (end 10.975 -4.25) (layer "F.Fab") (width 0.1) (tstamp d6aab0a9-a013-4d02-b90f-f30aecc8170e))
-  (fp_line (start 2.25 -2.75) (end 1.75 -2.75) (layer "F.Fab") (width 0.1) (tstamp e608843d-77d0-48f2-9bdb-7c933c30264c))
-  (fp_line (start -5.75 -2.75) (end -6.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp e6a03f68-1437-4192-9d75-99e5a7c32784))
-  (fp_line (start 3.75 -2.75) (end 3.75 -2.25) (layer "F.Fab") (width 0.1) (tstamp fb9ae583-5465-4b35-a5a8-268fa0bab4b5))
-  (fp_line (start 7.75 -2.25) (end 8.25 -2.25) (layer "F.Fab") (width 0.1) (tstamp fbfea6d6-f8d2-4d23-87f2-c1f9a3b55d69))
-  (fp_line (start 0.25 -2.25) (end 0.25 -2.75) (layer "F.Fab") (width 0.1) (tstamp ff139bb1-dd92-41b7-b105-da34065b7071))
-  (pad "1" smd roundrect (at -8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cd7567da-f874-4d17-ba10-6f3f63f6216c))
-  (pad "2" smd roundrect (at -6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1aff12cd-d329-45a5-a2e1-8cc7058a07ab))
-  (pad "3" smd roundrect (at -4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f847b571-4095-482c-8548-a29619d002c2))
-  (pad "4" smd roundrect (at -2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f1aeda3e-7e8d-4707-a1bc-9da52f6e08bb))
-  (pad "5" smd roundrect (at 0 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bab22dde-30f1-487f-9004-1c7954844722))
-  (pad "6" smd roundrect (at 2 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 954c5d4e-b404-485e-85a0-0887dcd1e8fc))
-  (pad "7" smd roundrect (at 4 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8fd0dc0c-4cc9-4f37-ad1e-b6f003bc7944))
-  (pad "8" smd roundrect (at 6 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 93aa9f79-0016-4587-91ba-2f3ff8a2207f))
-  (pad "9" smd roundrect (at 8 0.5) (size 1 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 92c9b614-5b20-42c3-8b0a-3c4ee0b94018))
-  (pad "MP" smd roundrect (at -10.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp 553e32c2-196e-4511-857d-339231b0c6a6))
-  (pad "MP" smd roundrect (at 10.4 -1.75) (size 1.6 3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15625) (tstamp d709e398-7a4d-4f28-822c-e141bcb601c7))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B9B-PH-SM4-TB_1x09-1MP_P2.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal.kicad_mod
index 4a4441315..642235cfb 100644
--- a/Connector_JST.pretty/JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,58 +1,78 @@
-(footprint "JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S10B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 735e3d54-4467-433e-9f67-c31b86ca0ddc)
   )
-  (fp_text value "JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 742ae402-cedf-4bd1-8e68-85f3e1eccf48)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -11.95 -3.2) (end -11.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.15 -3.2) (end -11.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.15 -1.6) (end 11.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.15 -1.6) (end 11.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.15 -3.2) (end 11.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.06 0.94) (end -12.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.06 -3.31) (end -11.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.04 -3.31) (end -11.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.04 -1.71) (end -9.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.76 -1.71) (end -9.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.06 0.94) (end 12.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.06 -3.31) (end 11.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.04 -3.31) (end 11.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.04 -1.71) (end 9.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.34 4.51) (end 10.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.95 4.4) (end 11.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.95 -3.2) (end -11.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.95 -3.2) (end 11.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.6 -5.1) (end -12.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12.6 5.1) (end 12.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.6 5.1) (end 12.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.6 -5.1) (end -12.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.5 -1.6) (end -9 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 -0.892893) (end -8.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 9 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -11.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 11.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f127a938-3d83-4d29-8104-d3b9e8ee573f)
   )
-  (fp_line (start -9.76 -1.71) (end -9.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 2bc77f48-57f3-4d02-8979-42d8c7415d6d))
-  (fp_line (start -10.34 4.51) (end 10.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp 3edd91d1-a8e5-4e16-8b37-2ac3cb1f302c))
-  (fp_line (start 12.06 -3.31) (end 11.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 4796f44f-4337-4ae4-ab01-5e85389e0ca8))
-  (fp_line (start 11.04 -1.71) (end 9.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 52b1b4b1-e2e2-42ff-b235-8e514b2740b0))
-  (fp_line (start -11.04 -3.31) (end -11.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 73c5be86-cff5-4946-83e7-a0d730f29e05))
-  (fp_line (start -12.06 0.94) (end -12.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 99c03cb8-e4c5-41ac-a007-b4b084ec0074))
-  (fp_line (start 12.06 0.94) (end 12.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp aa3bcc2b-0a0e-4e38-81d9-4fe83d054606))
-  (fp_line (start -11.04 -1.71) (end -9.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp b0c6ceca-b340-49ef-bbdc-951646a11820))
-  (fp_line (start 11.04 -3.31) (end 11.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp d82028ff-578c-4259-baba-c12bf23c2e23))
-  (fp_line (start -12.06 -3.31) (end -11.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp efe8c51b-3a3a-4d00-8651-7fb645d1d459))
-  (fp_line (start -12.6 -5.1) (end -12.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 129b5059-4d8a-46a7-a07f-71dc99597e14))
-  (fp_line (start 12.6 -5.1) (end -12.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 92a33036-2697-4dcb-bfb4-1cd1f3b39186))
-  (fp_line (start 12.6 5.1) (end 12.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp a9220cbe-83dd-4785-8683-22d53b6f6855))
-  (fp_line (start -12.6 5.1) (end 12.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp ce03e4aa-d475-4cca-aef5-264d397bf8e3))
-  (fp_line (start 11.95 -3.2) (end 11.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 0d545d4e-443d-45ca-ae02-82316d136ad4))
-  (fp_line (start -11.95 -3.2) (end -11.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 70cddfaa-95bc-4974-884b-13dd28533004))
-  (fp_line (start 11.15 -1.6) (end 11.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 8fb8ed54-d02f-4954-aacf-7f0d7b8b0a3b))
-  (fp_line (start -11.15 -1.6) (end 11.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 9df83c28-13ac-45ed-8737-db1f6e9cdf4e))
-  (fp_line (start -11.95 -3.2) (end -11.95 4.4) (layer "F.Fab") (width 0.1) (tstamp c40178ed-5eb2-4772-b7ba-50c08db4c7d0))
-  (fp_line (start -11.95 4.4) (end 11.95 4.4) (layer "F.Fab") (width 0.1) (tstamp cc83678c-f197-405d-bee2-6c27fb9af946))
-  (fp_line (start -9 -0.892893) (end -8.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp d6c8cbf0-b445-4a13-9d13-da68a1567482))
-  (fp_line (start -9.5 -1.6) (end -9 -0.892893) (layer "F.Fab") (width 0.1) (tstamp e1550ea7-a721-495f-809d-1db6bb158b06))
-  (fp_line (start -11.15 -3.2) (end -11.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp e9115853-9c61-4f32-bfc9-833108c47748))
-  (fp_line (start 11.15 -3.2) (end 11.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp fe6f5c40-f84e-48a8-b328-9a0b6de9f648))
-  (pad "1" smd roundrect (at -9 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 67604b0c-353c-4e98-9aee-c8478c6fa13f))
-  (pad "2" smd roundrect (at -7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a82bbc10-0e96-4d30-b353-aa42d5a27bb8))
-  (pad "3" smd roundrect (at -5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 715c1179-e6f8-4cee-976c-859779944f14))
-  (pad "4" smd roundrect (at -3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c1f15c3-8151-42ef-abde-19a98988b3ac))
-  (pad "5" smd roundrect (at -1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 386af209-605d-4367-b21e-96543b2d25b2))
-  (pad "6" smd roundrect (at 1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3fe0e01c-567b-4877-ad65-3866bfaf61a1))
-  (pad "7" smd roundrect (at 3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0b613e83-e78e-48ee-98df-91b69933ea1f))
-  (pad "8" smd roundrect (at 5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 86e87989-d09d-4e05-93b5-74bb74b2397f))
-  (pad "9" smd roundrect (at 7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97c27561-4c9e-48a1-831f-2c589274c59f))
-  (pad "10" smd roundrect (at 9 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6edae589-94aa-4447-ad50-3384e66b59d9))
-  (pad "MP" smd roundrect (at 11.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 9d98a8fc-2003-41b0-811b-bc0a5ac9e1dc))
-  (pad "MP" smd roundrect (at -11.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp a240323d-0bad-4efc-97db-886d6a0161c6))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S10B-PH-SM4-TB_1x10-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal.kicad_mod
index 7fd619436..e954172c7 100644
--- a/Connector_JST.pretty/JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,59 +1,79 @@
-(footprint "JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S11B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5c7e7e73-4cc6-45bd-b239-58a13201f9d0)
   )
-  (fp_text value "JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c29a2382-54e0-46d9-a3af-7197da9cf8e5)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -12.95 -3.2) (end -12.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.15 -3.2) (end -12.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.15 -1.6) (end 12.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.15 -1.6) (end 12.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.15 -3.2) (end 12.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.06 0.94) (end -13.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.06 -3.31) (end -12.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.04 -3.31) (end -12.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.04 -1.71) (end -10.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.76 -1.71) (end -10.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.06 0.94) (end 13.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.06 -3.31) (end 12.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.04 -3.31) (end 12.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.04 -1.71) (end 10.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.34 4.51) (end 11.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.95 4.4) (end 12.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.95 -3.2) (end -12.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.95 -3.2) (end 12.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.6 -5.1) (end -13.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13.6 5.1) (end 13.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.6 5.1) (end 13.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.6 -5.1) (end -13.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.5 -1.6) (end -10 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 -0.892893) (end -9.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -10 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 10 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -12.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 12.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 49509d98-2217-425f-9779-87df9608b728)
   )
-  (fp_line (start -12.04 -3.31) (end -12.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 1a9a5882-fdc5-4876-9280-89d4e96441dc))
-  (fp_line (start -12.04 -1.71) (end -10.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 3516c94b-f119-4473-9ecc-943f83079655))
-  (fp_line (start 12.04 -3.31) (end 12.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 808bd8ea-4110-4476-b1fc-d88702d396d8))
-  (fp_line (start 13.06 0.94) (end 13.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 876731bd-8d71-4c1a-bee0-649662d69677))
-  (fp_line (start 13.06 -3.31) (end 12.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 8ed46561-778e-476d-9af5-311a095f6c82))
-  (fp_line (start -13.06 -3.31) (end -12.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 970ec027-b754-4018-a63e-04e97af49185))
-  (fp_line (start -13.06 0.94) (end -13.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 9de73fab-f16d-4a9e-bff8-8733cb09f9ca))
-  (fp_line (start -11.34 4.51) (end 11.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp c68292d8-9e87-402c-85b7-85e02a96f890))
-  (fp_line (start -10.76 -1.71) (end -10.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp d700516f-518c-45b3-a6e5-ec5c34f9a71f))
-  (fp_line (start 12.04 -1.71) (end 10.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp df83557c-e3c3-4c8d-a147-62bbfb20a3d7))
-  (fp_line (start -13.6 5.1) (end 13.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 13ec5199-fc0d-4b49-95c7-f009f2d67b90))
-  (fp_line (start 13.6 5.1) (end 13.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 471a9c02-c0b0-452f-aecd-1c7f4fbfdaa5))
-  (fp_line (start -13.6 -5.1) (end -13.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 6c39a4ff-bd2e-4e5a-83f4-9407d09f08cd))
-  (fp_line (start 13.6 -5.1) (end -13.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp b3731a7c-b2c7-4b76-b83d-e39bede33b6f))
-  (fp_line (start -12.15 -1.6) (end 12.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 0027aae5-9615-4f46-b2ea-836374ad4ced))
-  (fp_line (start -10 -0.892893) (end -9.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 14a3ac9e-cfef-41e6-8e83-80a3fcf971f3))
-  (fp_line (start -12.95 -3.2) (end -12.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 260b636a-58fa-4b27-b432-f23553280504))
-  (fp_line (start -12.15 -3.2) (end -12.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 70c734d4-f256-4fda-b5da-c28b4f80770c))
-  (fp_line (start -12.95 4.4) (end 12.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 9bcb2a2e-ee45-43de-8619-b9d01f46333a))
-  (fp_line (start 12.15 -1.6) (end 12.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp a50f6e78-5b02-4ef9-b1e1-85fe78407ea5))
-  (fp_line (start 12.95 -3.2) (end 12.95 4.4) (layer "F.Fab") (width 0.1) (tstamp c1c9f786-b267-488f-9b4b-43fe136c3ae6))
-  (fp_line (start -12.95 -3.2) (end -12.95 4.4) (layer "F.Fab") (width 0.1) (tstamp d3b62b56-57e3-455f-a771-764bbccf8cdd))
-  (fp_line (start -10.5 -1.6) (end -10 -0.892893) (layer "F.Fab") (width 0.1) (tstamp d8f8a86c-b1ac-4ba5-b554-8e0d03d543d3))
-  (fp_line (start 12.15 -3.2) (end 12.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp f77b91d1-5aa0-433e-9103-639523147590))
-  (pad "1" smd roundrect (at -10 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 173fc5ff-a337-499c-b626-1ed248844220))
-  (pad "2" smd roundrect (at -8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 385600f6-0333-425e-89b2-16b73fb463d4))
-  (pad "3" smd roundrect (at -6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d8093dd5-cd5b-4b81-a793-4c3d3e4224b7))
-  (pad "4" smd roundrect (at -4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6996ab89-a169-418e-bd23-90afe0bb377e))
-  (pad "5" smd roundrect (at -2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 23c21ad3-416d-4a35-9f45-3ea31dbbdaa2))
-  (pad "6" smd roundrect (at 0 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f0289aa5-de2f-4e98-9750-f5afa70465bc))
-  (pad "7" smd roundrect (at 2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 62d90431-a5ba-469b-9bf3-e518ebf6d544))
-  (pad "8" smd roundrect (at 4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 887704c7-5eb0-47f3-aebb-be590a23fe0d))
-  (pad "9" smd roundrect (at 6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c077bc7b-c198-4488-ab1f-63bdc172d423))
-  (pad "10" smd roundrect (at 8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b668a5b7-b9a8-486f-b26d-9ab2b8469297))
-  (pad "11" smd roundrect (at 10 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 37e41245-d689-4875-a393-308b40fd0e76))
-  (pad "MP" smd roundrect (at 12.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 1d75305d-ce5a-43ae-bbf0-991a44e999c9))
-  (pad "MP" smd roundrect (at -12.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 57ea4527-8fe8-4945-940b-91ed4cc623eb))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S11B-PH-SM4-TB_1x11-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal.kicad_mod
index 64dd4b24b..8e3e8324b 100644
--- a/Connector_JST.pretty/JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,60 +1,80 @@
-(footprint "JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S12B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9fdb0642-6ff4-48c5-8b50-5166dfb17f4c)
   )
-  (fp_text value "JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 92d94e52-6029-49e8-ab07-d49d2ddef283)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -13.95 -3.2) (end -13.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.15 -3.2) (end -13.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.15 -1.6) (end 13.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.15 -1.6) (end 13.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.15 -3.2) (end 13.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.06 0.94) (end -14.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.06 -3.31) (end -13.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.04 -3.31) (end -13.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.04 -1.71) (end -11.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.76 -1.71) (end -11.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.06 0.94) (end 14.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.06 -3.31) (end 13.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.04 -3.31) (end 13.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.04 -1.71) (end 11.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.34 4.51) (end 12.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.95 4.4) (end 13.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.95 -3.2) (end -13.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.95 -3.2) (end 13.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.6 -5.1) (end -14.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -14.6 5.1) (end 14.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.6 5.1) (end 14.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.6 -5.1) (end -14.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.5 -1.6) (end -11 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11 -0.892893) (end -10.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -11 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -9 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 9 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 11 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -13.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 13.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2bfbbf84-ca79-4c57-94ad-e47ad8ed1d94)
   )
-  (fp_line (start -13.04 -1.71) (end -11.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 25504bcc-0f72-42de-8226-00d3ee24827b))
-  (fp_line (start 14.06 -3.31) (end 13.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 314b7044-a5fa-4ff5-bd09-390fb9cca939))
-  (fp_line (start 13.04 -1.71) (end 11.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 5e9ccf54-eab6-4ed2-bddd-2e012a0b75de))
-  (fp_line (start 13.04 -3.31) (end 13.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 91200081-1965-4133-a71c-af4e0bb551c4))
-  (fp_line (start -14.06 -3.31) (end -13.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp a68be600-6bf7-4443-ae27-bdc357174765))
-  (fp_line (start -13.04 -3.31) (end -13.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp af6187a2-453e-4ec0-8752-e2b32d5bbe27))
-  (fp_line (start -14.06 0.94) (end -14.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp cd9f057f-6269-4841-ad92-f71a2b0deec5))
-  (fp_line (start -12.34 4.51) (end 12.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp d096e43c-8c55-409a-a3a5-c91a99c96b89))
-  (fp_line (start -11.76 -1.71) (end -11.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp d425f54a-422b-4cf4-b9e5-09e0892d9b11))
-  (fp_line (start 14.06 0.94) (end 14.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp e3499ca9-4892-48d2-aeba-bbcd68a105e8))
-  (fp_line (start -14.6 -5.1) (end -14.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 2181e8ae-73e0-49fb-ae93-e133674dec81))
-  (fp_line (start 14.6 5.1) (end 14.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 2b5f3572-60af-438f-96cc-2fb4ad9b82f2))
-  (fp_line (start 14.6 -5.1) (end -14.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 90480cec-7000-44d7-9711-d12ae9961f93))
-  (fp_line (start -14.6 5.1) (end 14.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp b610d17f-ec76-408d-8ce5-2271f6a39133))
-  (fp_line (start -13.95 -3.2) (end -13.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 14fa55e2-9405-438a-8ad7-82537b18beba))
-  (fp_line (start 13.15 -1.6) (end 13.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 17dc9742-af38-481b-9131-05d3c4162294))
-  (fp_line (start -13.15 -3.2) (end -13.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 5a6cbe83-17cb-4803-993b-164f7a269d7c))
-  (fp_line (start 13.95 -3.2) (end 13.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 5e872108-2697-4d7e-98f1-2e09e7a2cf81))
-  (fp_line (start 13.15 -3.2) (end 13.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp 77a496ab-b4bc-475e-a0d1-d2db918d97af))
-  (fp_line (start -11.5 -1.6) (end -11 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 7ad4fb54-b875-4ffd-afbd-db7062950b83))
-  (fp_line (start -11 -0.892893) (end -10.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 9e5c501e-4268-41e8-8853-e3d8e910e3c2))
-  (fp_line (start -13.95 -3.2) (end -13.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp ca657c28-1b78-46c6-b195-2280021ca6f3))
-  (fp_line (start -13.95 4.4) (end 13.95 4.4) (layer "F.Fab") (width 0.1) (tstamp dae342a4-45fa-425f-b6f5-a3398609f9a7))
-  (fp_line (start -13.15 -1.6) (end 13.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp f63f44f3-2e1c-4ace-96f8-1c9967b2240a))
-  (pad "1" smd roundrect (at -11 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d4d32c81-1a53-4349-8274-897b14874d36))
-  (pad "2" smd roundrect (at -9 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9a7916e0-3dd5-4f35-acfb-757f23e3f3e7))
-  (pad "3" smd roundrect (at -7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5a51abd2-1696-4ac8-b3a7-25ef87e1759a))
-  (pad "4" smd roundrect (at -5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b7fd0e91-ff90-4419-8a2e-191d217783bf))
-  (pad "5" smd roundrect (at -3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f7ab2895-b0dd-40ca-af69-bab7dcfc2e33))
-  (pad "6" smd roundrect (at -1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1ce1eed1-c6d0-40a2-940b-9f7cc0f6d3f5))
-  (pad "7" smd roundrect (at 1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0b5aa83e-d682-4536-96cb-8b3c6c8f6ea6))
-  (pad "8" smd roundrect (at 3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f3371082-a715-4c6b-b7c5-894db71b7344))
-  (pad "9" smd roundrect (at 5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2e4aa58b-cb04-480a-8bb5-f66afd64b39f))
-  (pad "10" smd roundrect (at 7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a66a582c-e1bb-4d03-86c0-a09f36c44fac))
-  (pad "11" smd roundrect (at 9 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp add374a4-e4e2-40f0-afaf-d795d109a006))
-  (pad "12" smd roundrect (at 11 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0a0b0a8b-33db-4be2-a8e3-06cf41e14e6a))
-  (pad "MP" smd roundrect (at -13.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 41c5d827-6b68-46ab-a1d7-3fdef451ac9e))
-  (pad "MP" smd roundrect (at 13.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp ea477769-f075-4768-8e1c-b016d7641ee6))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S12B-PH-SM4-TB_1x12-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal.kicad_mod
index 47f3f4cc2..c55703358 100644
--- a/Connector_JST.pretty/JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,61 +1,81 @@
-(footprint "JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S13B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5d1c747a-e44d-4436-97ea-954610bb458e)
   )
-  (fp_text value "JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8286461c-8c63-474f-a5fe-2457568eb534)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -14.95 -3.2) (end -14.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.15 -3.2) (end -14.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.15 -1.6) (end 14.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.15 -1.6) (end 14.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.15 -3.2) (end 14.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.06 0.94) (end -15.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.06 -3.31) (end -14.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.04 -3.31) (end -14.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.04 -1.71) (end -12.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.76 -1.71) (end -12.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 15.06 0.94) (end 15.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 15.06 -3.31) (end 14.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.04 -3.31) (end 14.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.04 -1.71) (end 12.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.34 4.51) (end 13.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.95 4.4) (end 14.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.95 -3.2) (end -14.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.95 -3.2) (end 14.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.6 -5.1) (end -15.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -15.6 5.1) (end 15.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.6 5.1) (end 15.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.6 -5.1) (end -15.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12.5 -1.6) (end -12 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12 -0.892893) (end -11.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -12 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -10 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 10 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 12 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -14.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 14.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0b79b660-0274-446d-9f4e-39acdd578ff5)
   )
-  (fp_line (start 15.06 -3.31) (end 14.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 06323033-1e5f-4498-85d1-50cf077bcf2b))
-  (fp_line (start -13.34 4.51) (end 13.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp 122259e0-c5ad-425c-a1be-7898528f7993))
-  (fp_line (start 14.04 -1.71) (end 12.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 175eebd5-7459-4b64-b917-ad6083d6b420))
-  (fp_line (start -15.06 0.94) (end -15.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 1df0f329-cabf-4970-8f0e-a2c8e30eac1a))
-  (fp_line (start 15.06 0.94) (end 15.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 1ea3f724-f84d-41c6-9176-af272a60f5b9))
-  (fp_line (start -14.04 -3.31) (end -14.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 36e1e5f0-b1aa-43e2-96df-e66b34f8ef5c))
-  (fp_line (start -14.04 -1.71) (end -12.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 4fbc9f72-35b9-4d40-91db-870943ed8004))
-  (fp_line (start 14.04 -3.31) (end 14.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 7bef2de5-5e48-42ce-92a8-6cab0c41afdc))
-  (fp_line (start -12.76 -1.71) (end -12.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp c8525d8d-4257-4278-8e28-f9bd0a406004))
-  (fp_line (start -15.06 -3.31) (end -14.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp dfaa47d6-54d7-44a6-a0f6-908a29691e3f))
-  (fp_line (start 15.6 -5.1) (end -15.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 14910c4b-3d3d-4c27-a8b9-d1c3016e8738))
-  (fp_line (start -15.6 5.1) (end 15.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp a60d6d8b-976e-42e4-add5-833851bb0e0a))
-  (fp_line (start 15.6 5.1) (end 15.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp bd60a566-ff31-4140-8dba-2713fa9dd159))
-  (fp_line (start -15.6 -5.1) (end -15.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp dfc12d74-0c32-448d-967e-8ca30ba7224d))
-  (fp_line (start -14.95 -3.2) (end -14.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 2f96506e-21ca-448e-a993-fab895562d30))
-  (fp_line (start -14.15 -1.6) (end 14.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 3befe656-d3be-40ba-bc4d-44a0a468ebbe))
-  (fp_line (start -12 -0.892893) (end -11.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 583777f6-f293-4384-b5fc-f34636dc355e))
-  (fp_line (start 14.15 -3.2) (end 14.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp 76290948-a8c8-4444-bb54-61a28e1768cb))
-  (fp_line (start -14.95 -3.2) (end -14.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 7d5da176-412c-46c2-8a07-06b96d99502d))
-  (fp_line (start -12.5 -1.6) (end -12 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 8e09008a-e1ea-46f4-965d-9a61b310ceac))
-  (fp_line (start 14.95 -3.2) (end 14.95 4.4) (layer "F.Fab") (width 0.1) (tstamp b246d1d3-aa81-472e-91d5-1c2de22a8c1f))
-  (fp_line (start -14.15 -3.2) (end -14.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp c6b2bc09-dad1-4d49-8b99-ad1458f8512b))
-  (fp_line (start -14.95 4.4) (end 14.95 4.4) (layer "F.Fab") (width 0.1) (tstamp c781bc02-ad51-4044-becb-7ba4d7d5ede2))
-  (fp_line (start 14.15 -1.6) (end 14.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp d1b24f87-be66-463f-9751-219b61da34da))
-  (pad "1" smd roundrect (at -12 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5ffcc2b9-602e-4943-98f2-b18f934d7492))
-  (pad "2" smd roundrect (at -10 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 179da6bf-6234-4d00-8d92-43f893575597))
-  (pad "3" smd roundrect (at -8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9938be84-b413-4a17-b003-02f70d735b1e))
-  (pad "4" smd roundrect (at -6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c948febf-b08e-4e50-8b4f-1f68dc9dbbc3))
-  (pad "5" smd roundrect (at -4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1c397e73-d4fc-4388-b028-cbf431c80ad5))
-  (pad "6" smd roundrect (at -2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b1cfb00f-1a05-4d9e-b266-a22a9ca56ecc))
-  (pad "7" smd roundrect (at 0 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 20cd5696-683b-4aad-be3a-c8c120d9ad79))
-  (pad "8" smd roundrect (at 2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d11e7957-d8cc-469a-9202-d6ecc60b4d2d))
-  (pad "9" smd roundrect (at 4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2ed7476e-07f2-4360-b8b8-fba5316806db))
-  (pad "10" smd roundrect (at 6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d5bcce2-8968-4e31-9dd9-584cb6836565))
-  (pad "11" smd roundrect (at 8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5d5061f-c3af-45e3-a8a7-4854d8d0c8cb))
-  (pad "12" smd roundrect (at 10 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fc2ed0de-c21f-4d80-b14b-7cb788733410))
-  (pad "13" smd roundrect (at 12 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6cd804be-c17b-4975-b214-220a039a95f0))
-  (pad "MP" smd roundrect (at 14.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 987cbd27-3d50-4242-a963-e9956a0d2891))
-  (pad "MP" smd roundrect (at -14.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp b6853536-096d-43e7-9359-b0a18bb72a49))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S13B-PH-SM4-TB_1x13-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal.kicad_mod
index cfeb6b0dd..ea38ce62e 100644
--- a/Connector_JST.pretty/JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,62 +1,82 @@
-(footprint "JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S14B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1053f6a8-126c-45dd-914f-418e26eb631b)
   )
-  (fp_text value "JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d03aca6e-e454-4446-8f29-fda2109f40cc)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -15.95 -3.2) (end -15.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.15 -3.2) (end -15.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.15 -1.6) (end 15.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 15.15 -1.6) (end 15.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 15.15 -3.2) (end 15.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.06 0.94) (end -16.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.06 -3.31) (end -15.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.04 -3.31) (end -15.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.04 -1.71) (end -13.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.76 -1.71) (end -13.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.06 0.94) (end 16.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.06 -3.31) (end 15.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 15.04 -3.31) (end 15.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 15.04 -1.71) (end 13.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.34 4.51) (end 14.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.95 4.4) (end 15.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.95 -3.2) (end -15.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 15.95 -3.2) (end 15.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.6 -5.1) (end -16.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -16.6 5.1) (end 16.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 16.6 5.1) (end 16.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 16.6 -5.1) (end -16.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13.5 -1.6) (end -13 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13 -0.892893) (end -12.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -13 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -11 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -9 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 9 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 11 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 13 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -15.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 15.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2a0caed9-e788-4538-9f29-56c74681d922)
   )
-  (fp_line (start -14.34 4.51) (end 14.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp 0e3e1572-4dbb-46cd-b08f-875e96a046a5))
-  (fp_line (start -15.04 -1.71) (end -13.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 5cfb7a8d-a5fb-4b08-990a-3c5f42d8316a))
-  (fp_line (start 15.04 -3.31) (end 15.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 62913336-6539-48bb-81e2-30a4203ee9a2))
-  (fp_line (start -13.76 -1.71) (end -13.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 701940fe-dadd-45cd-827a-34daa012d439))
-  (fp_line (start 16.06 -3.31) (end 15.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 7719428e-201b-436e-86dd-4f8da3aed43d))
-  (fp_line (start -16.06 -3.31) (end -15.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 9cab6be4-f0dd-4ce9-885e-2be847ef5f8b))
-  (fp_line (start 16.06 0.94) (end 16.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp d9d12556-cfa4-4fee-9b62-0dee329cd21b))
-  (fp_line (start -16.06 0.94) (end -16.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp de0305c7-e8c3-4b35-9d59-36ddeaaf0012))
-  (fp_line (start 15.04 -1.71) (end 13.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp e13c1939-bd77-46b4-9f67-6e791da1fbfd))
-  (fp_line (start -15.04 -3.31) (end -15.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp fed542d5-1df5-4227-94f0-0235bccba686))
-  (fp_line (start -16.6 5.1) (end 16.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 520889ec-6679-4e98-8b6a-24ec3ad060ee))
-  (fp_line (start -16.6 -5.1) (end -16.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 5b595d16-9cf7-4943-8f49-2945bf78e14f))
-  (fp_line (start 16.6 5.1) (end 16.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 6fd28dcc-55a4-40ef-9204-f9b0d3de940a))
-  (fp_line (start 16.6 -5.1) (end -16.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 98bf256f-5827-4d96-a27d-50ae36119597))
-  (fp_line (start 15.15 -3.2) (end 15.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp 12eae791-34cd-4973-af53-a60990b15e7f))
-  (fp_line (start 15.15 -1.6) (end 15.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 20027a4f-7846-4986-a1c2-9fad9574b8df))
-  (fp_line (start 15.95 -3.2) (end 15.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 29aaeb82-b20e-438a-8084-ffdcd8df4e8f))
-  (fp_line (start -15.15 -1.6) (end 15.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 70a62030-dc1b-4116-a5d0-c4f9f8f28962))
-  (fp_line (start -15.95 -3.2) (end -15.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 8bd3730c-17a7-4015-8bba-7db413692fee))
-  (fp_line (start -15.95 4.4) (end 15.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 8c862d65-7177-4c77-883c-257ecb315a4c))
-  (fp_line (start -13.5 -1.6) (end -13 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 9562b61e-2d06-4f52-8f74-0b02d685431f))
-  (fp_line (start -15.15 -3.2) (end -15.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 9d5d41cc-d312-44d3-89cf-bb1fe7d33677))
-  (fp_line (start -15.95 -3.2) (end -15.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp be4bdca1-429a-4f9c-ba14-f4e77992fcc6))
-  (fp_line (start -13 -0.892893) (end -12.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp be6a960a-8bf1-436e-afdd-0fb5d61972b5))
-  (pad "1" smd roundrect (at -13 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ff3b604a-8e8e-4059-865c-5e2886fb0a49))
-  (pad "2" smd roundrect (at -11 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 332fbdc6-9a5b-417d-9315-c0849ec331d5))
-  (pad "3" smd roundrect (at -9 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 42e47d38-4161-4979-9925-db0af0f45e8f))
-  (pad "4" smd roundrect (at -7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp accabb72-57b1-473a-8118-de54a589852a))
-  (pad "5" smd roundrect (at -5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e77fb7db-55ed-4862-af87-d56fcf36c3b6))
-  (pad "6" smd roundrect (at -3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 43e00c38-35ef-4932-8b3d-bd021712f06d))
-  (pad "7" smd roundrect (at -1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a5d8bac0-bfc0-4b72-be0e-d36e3806b8c3))
-  (pad "8" smd roundrect (at 1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e7dea53b-20eb-4ec7-8ad7-bc32935b218b))
-  (pad "9" smd roundrect (at 3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e1ec0d16-a0dc-400d-8f9f-fc005f371131))
-  (pad "10" smd roundrect (at 5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 924e5eb6-19ab-4ed4-80ab-6a09c1970982))
-  (pad "11" smd roundrect (at 7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ac1e023c-fdd9-4b63-aa9a-41d80b7f3556))
-  (pad "12" smd roundrect (at 9 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b864de91-2e73-40ed-9a9c-580cab6d11c4))
-  (pad "13" smd roundrect (at 11 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f33f8ffc-99a5-4874-a1d5-3b81a800a61c))
-  (pad "14" smd roundrect (at 13 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b7bba5cf-1826-4e73-949f-c830f1ea1590))
-  (pad "MP" smd roundrect (at -15.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 67065533-b230-4cf8-9a31-753455e63a5a))
-  (pad "MP" smd roundrect (at 15.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp b325299f-4dd8-4804-8733-0780e5ce92cf))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S14B-PH-SM4-TB_1x14-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal.kicad_mod
index e0d30f7cb..64ab6aef9 100644
--- a/Connector_JST.pretty/JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,63 +1,83 @@
-(footprint "JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S15B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8cdc4fe7-683f-47cc-a202-1aa9b8ec0484)
   )
-  (fp_text value "JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 83a92769-5011-47a3-a635-6a1c00c5cb4b)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -16.95 -3.2) (end -16.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.15 -3.2) (end -16.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.15 -1.6) (end 16.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 16.15 -1.6) (end 16.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 16.15 -3.2) (end 16.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -17.06 0.94) (end -17.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -17.06 -3.31) (end -16.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.04 -3.31) (end -16.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.04 -1.71) (end -14.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.76 -1.71) (end -14.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 17.06 0.94) (end 17.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 17.06 -3.31) (end 16.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.04 -3.31) (end 16.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.04 -1.71) (end 14.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.34 4.51) (end 15.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.95 4.4) (end 16.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.95 -3.2) (end -16.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 16.95 -3.2) (end 16.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -17.6 -5.1) (end -17.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -17.6 5.1) (end 17.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 17.6 5.1) (end 17.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 17.6 -5.1) (end -17.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -14.5 -1.6) (end -14 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14 -0.892893) (end -13.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -14 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -12 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -10 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 10 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 12 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 14 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -16.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 16.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 19ae614d-23aa-4c5c-a335-a478b0a84dc8)
   )
-  (fp_line (start -14.76 -1.71) (end -14.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 2d251e52-871d-4c8a-b29b-e49cadf76406))
-  (fp_line (start -15.34 4.51) (end 15.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp 5e166af9-e935-4069-94e2-ed8e3d403b5e))
-  (fp_line (start -16.04 -1.71) (end -14.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 7a535177-676c-4a15-9f2b-24cef3b148d0))
-  (fp_line (start 16.04 -1.71) (end 14.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 9211cf5f-303d-4ee1-9e3c-da02ac036d09))
-  (fp_line (start -17.06 -3.31) (end -16.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp c1c7fb7c-c2ef-4b62-af52-9c21cb6c204f))
-  (fp_line (start 17.06 0.94) (end 17.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp c5ec1422-0bf7-41a8-b6f5-0d14515f8dd5))
-  (fp_line (start -16.04 -3.31) (end -16.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp d4623f1f-8b85-44a4-b9cb-a23ee3e402d3))
-  (fp_line (start 17.06 -3.31) (end 16.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp de23297d-d79e-4b41-a6b0-4b7d927f4373))
-  (fp_line (start -17.06 0.94) (end -17.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp eb31245e-6ffd-4f43-9a22-dce89b259d80))
-  (fp_line (start 16.04 -3.31) (end 16.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp ed9dfd53-ee72-4e9c-b374-69d221a0b5e8))
-  (fp_line (start 17.6 -5.1) (end -17.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 8734bc8c-9962-42ba-a21b-e83d0ceb5f29))
-  (fp_line (start 17.6 5.1) (end 17.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 8bafdbe8-ae39-4b00-abcc-10cdc7fe44c9))
-  (fp_line (start -17.6 -5.1) (end -17.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 9765277b-9093-43ed-a7db-4de94b1f98f2))
-  (fp_line (start -17.6 5.1) (end 17.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp a9f7dd46-649e-44b7-9043-e97916c82952))
-  (fp_line (start -16.95 4.4) (end 16.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 5083b242-173f-4f04-92c1-5e800c10ae64))
-  (fp_line (start -14 -0.892893) (end -13.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 56ccd70e-c017-4fc9-930e-998b55c8bea9))
-  (fp_line (start -14.5 -1.6) (end -14 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 6d07582d-6d5c-4a14-9efa-650b7a1da27b))
-  (fp_line (start -16.15 -3.2) (end -16.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 77730044-d8ed-40a3-b942-210a2e00132d))
-  (fp_line (start -16.15 -1.6) (end 16.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 909bfa58-c3a3-4e74-81d2-46964af67519))
-  (fp_line (start 16.15 -1.6) (end 16.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp add0fc76-eb20-4123-a541-d1a971719048))
-  (fp_line (start 16.15 -3.2) (end 16.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp d3fd1289-e9e5-4d5e-8677-50535e22ef28))
-  (fp_line (start -16.95 -3.2) (end -16.95 4.4) (layer "F.Fab") (width 0.1) (tstamp df9862a5-0598-46d5-8de8-f9216d708623))
-  (fp_line (start -16.95 -3.2) (end -16.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp e91b3432-6c25-4b6e-a65e-5c433745666f))
-  (fp_line (start 16.95 -3.2) (end 16.95 4.4) (layer "F.Fab") (width 0.1) (tstamp fb6a7783-78f1-4299-893b-7591790acde4))
-  (pad "1" smd roundrect (at -14 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6b963d78-dc3d-45cb-97eb-96058bdb822a))
-  (pad "2" smd roundrect (at -12 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6d89cbc6-841e-40a1-8148-14f8635e255f))
-  (pad "3" smd roundrect (at -10 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f4a47399-9afb-4e81-a394-04f93ea64d0c))
-  (pad "4" smd roundrect (at -8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bdbe7e3d-5adc-4fa0-855e-7dfd737e6ac8))
-  (pad "5" smd roundrect (at -6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d2f0ff89-e69c-4f09-8ebe-72c23c43a548))
-  (pad "6" smd roundrect (at -4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 23d7b7ee-35ae-4596-86b0-69662c901e88))
-  (pad "7" smd roundrect (at -2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 47029140-bc6c-41ed-8d9d-ba74cf68b21d))
-  (pad "8" smd roundrect (at 0 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp df3294a3-ecbd-46c8-bd02-8286d34655ad))
-  (pad "9" smd roundrect (at 2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5e8dabe5-a6ef-4e84-a299-5c415fe4b398))
-  (pad "10" smd roundrect (at 4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 02f12e5b-66c7-4240-9b24-d6d911b9c0c2))
-  (pad "11" smd roundrect (at 6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 83a0bf03-1791-4f7c-8163-0150c9c83e67))
-  (pad "12" smd roundrect (at 8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ab53aa10-3e66-40db-918a-797353b2cf87))
-  (pad "13" smd roundrect (at 10 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 725b9d2f-c760-4209-b446-5cad8e9b4df9))
-  (pad "14" smd roundrect (at 12 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 451cfd6d-4d0b-4647-8f2d-2b8cb1512ca1))
-  (pad "15" smd roundrect (at 14 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dfa7a4d0-b8eb-4c5e-b6e3-17a573a692ae))
-  (pad "MP" smd roundrect (at 16.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 195ae6a4-b85e-4558-af07-6f8b709c412c))
-  (pad "MP" smd roundrect (at -16.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 298baa79-4dac-429d-bf7c-f0c93584cd68))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S15B-PH-SM4-TB_1x15-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal.kicad_mod
index b17d9bf8f..0866f44fa 100644
--- a/Connector_JST.pretty/JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,50 +1,70 @@
-(footprint "JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S2B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 62da1c54-ca81-4cfd-a945-8c0f883e6683)
   )
-  (fp_text value "JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp df8bb3ea-d180-4e38-9a90-c5675bc17335)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -3.95 -3.2) (end -3.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -3.2) (end -3.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -1.6) (end 3.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -1.6) (end 3.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -3.2) (end 3.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.06 0.94) (end -4.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.06 -3.31) (end -3.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.04 -3.31) (end -3.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.04 -1.71) (end -1.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.76 -1.71) (end -1.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.06 0.94) (end 4.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.06 -3.31) (end 3.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.04 -3.31) (end 3.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.04 -1.71) (end 1.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.34 4.51) (end 2.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.95 4.4) (end 3.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.95 -3.2) (end -3.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.95 -3.2) (end 3.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.6 -5.1) (end -4.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.6 5.1) (end 4.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.6 5.1) (end 4.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.6 -5.1) (end -4.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.5 -1.6) (end -1 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.892893) (end -0.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 3.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a4b32be0-6b4f-4a1c-a09b-e81fb5f7655d)
   )
-  (fp_line (start -3.04 -1.71) (end -1.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 18c4c990-f744-4d5c-8623-13249fad8f0b))
-  (fp_line (start 3.04 -1.71) (end 1.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 2e376906-44a0-4fb0-a80e-bfe6904e3950))
-  (fp_line (start -3.04 -3.31) (end -3.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 4482a9b9-ecb2-4669-8ca7-bcc37a28ec51))
-  (fp_line (start -1.76 -1.71) (end -1.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 79977d35-3cd0-499c-b4c6-dccdff487265))
-  (fp_line (start -4.06 0.94) (end -4.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 7b77b195-1722-4859-baa5-830a2f5fff42))
-  (fp_line (start -4.06 -3.31) (end -3.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 9f5edd7e-9419-4eb8-9cd5-6e9ee9dd368d))
-  (fp_line (start -2.34 4.51) (end 2.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp b33e0fce-9d86-4e42-b2e1-1ebc4580c0b5))
-  (fp_line (start 3.04 -3.31) (end 3.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp db5ee76a-0de7-4233-8d88-76649ab19f1e))
-  (fp_line (start 4.06 -3.31) (end 3.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp f2bd0216-bed4-4381-bf68-2e6f9ad99e66))
-  (fp_line (start 4.06 0.94) (end 4.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp ff72d3af-821c-4fe5-ada1-e3abd2d11212))
-  (fp_line (start -4.6 -5.1) (end -4.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 910bb7f4-2ea7-42f6-913c-650493c2a4bf))
-  (fp_line (start 4.6 5.1) (end 4.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp c085a3b0-921e-4d3a-8a68-462383ae8cbc))
-  (fp_line (start 4.6 -5.1) (end -4.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp c962a9f2-2782-4009-bc70-8eab4aaed844))
-  (fp_line (start -4.6 5.1) (end 4.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp f50d03fd-5203-4d62-b646-654f5de48baa))
-  (fp_line (start -3.15 -1.6) (end 3.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 0b08f560-fbf4-4541-ab4a-f6a900880802))
-  (fp_line (start 3.15 -1.6) (end 3.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 1c2cf541-5ea8-443e-a27c-5bc01c5a4620))
-  (fp_line (start -3.95 4.4) (end 3.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 4a6f5cea-89da-4f02-970c-1715e619c14f))
-  (fp_line (start -3.15 -3.2) (end -3.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 6ad7ac9a-42b9-4fb9-8fc5-e4befbfc2438))
-  (fp_line (start -1.5 -1.6) (end -1 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 7dff8a45-c90f-4115-b725-8f8695fd737f))
-  (fp_line (start 3.95 -3.2) (end 3.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 842ec605-4473-4176-ad44-c7e3a590e008))
-  (fp_line (start -3.95 -3.2) (end -3.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp aa8e7c32-04a6-415e-bf3e-3365bced8688))
-  (fp_line (start -1 -0.892893) (end -0.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp c2116945-0d02-4eb9-90bd-7022cf22d2d1))
-  (fp_line (start 3.15 -3.2) (end 3.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp d880120c-0d3e-4645-b243-9efde3ebad75))
-  (fp_line (start -3.95 -3.2) (end -3.95 4.4) (layer "F.Fab") (width 0.1) (tstamp eeb62717-f259-4ebf-a63b-293aad9bbc3d))
-  (pad "1" smd roundrect (at -1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ac23020b-88f1-439e-bdbf-88ce75126444))
-  (pad "2" smd roundrect (at 1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e3e094b-c117-46dc-86cd-5842d137a3be))
-  (pad "MP" smd roundrect (at 3.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 235967b2-e1df-4ce6-b0e1-6c5cf861d5b9))
-  (pad "MP" smd roundrect (at -3.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 39f5b3a4-a867-4fa9-b116-3edb6de82bea))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S2B-PH-SM4-TB_1x02-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal.kicad_mod
index d12ec9c34..b503eadb1 100644
--- a/Connector_JST.pretty/JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,51 +1,71 @@
-(footprint "JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S3B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6299afcb-9636-4e41-8dde-cd9277f0f606)
   )
-  (fp_text value "JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 72100f0c-fc39-4e89-8749-aad69e2b48d0)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -4.95 -3.2) (end -4.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -3.2) (end -4.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -1.6) (end 4.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -1.6) (end 4.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -3.2) (end 4.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.06 0.94) (end -5.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.06 -3.31) (end -4.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.04 -3.31) (end -4.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.04 -1.71) (end -2.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.76 -1.71) (end -2.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.06 0.94) (end 5.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.06 -3.31) (end 4.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.04 -3.31) (end 4.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.04 -1.71) (end 2.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.34 4.51) (end 3.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.95 4.4) (end 4.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.95 -3.2) (end -4.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.95 -3.2) (end 4.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.6 -5.1) (end -5.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.6 5.1) (end 5.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.6 5.1) (end 5.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.6 -5.1) (end -5.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.5 -1.6) (end -2 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.892893) (end -1.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 4.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e84a57cf-6310-485a-b11f-bc26e0cf22a8)
   )
-  (fp_line (start 5.06 0.94) (end 5.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 11b53b12-6f0c-48cd-8eaf-a79d1de910f1))
-  (fp_line (start -2.76 -1.71) (end -2.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 28ede072-3078-44dc-b2f7-1878f8016a54))
-  (fp_line (start -4.04 -3.31) (end -4.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 4492b630-3d16-4f0c-91ff-8463abd3d4fc))
-  (fp_line (start -3.34 4.51) (end 3.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp 743442bb-dfe9-4635-adcd-164fa05533fc))
-  (fp_line (start 4.04 -3.31) (end 4.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp a34b0ab3-eaf8-4ee2-99b8-da5fa94648ba))
-  (fp_line (start -5.06 -3.31) (end -4.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp b6c27551-360b-430f-a834-d9477c73af7e))
-  (fp_line (start -4.04 -1.71) (end -2.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp bdcf0a6c-b980-488f-a1a5-e9f4ab941e47))
-  (fp_line (start 5.06 -3.31) (end 4.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp c37d0706-61c2-4a42-8fba-99f857294f17))
-  (fp_line (start 4.04 -1.71) (end 2.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp dbbef411-baa5-43cb-9d1e-51e28bf61651))
-  (fp_line (start -5.06 0.94) (end -5.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp e95b3758-ae92-46e0-8002-5981bf3bdafa))
-  (fp_line (start 5.6 5.1) (end 5.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 086b4d5c-c18a-434a-ad35-9f5a5bcbbe47))
-  (fp_line (start -5.6 -5.1) (end -5.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp c9cd5543-59bb-44f2-849e-d6d4cd33a3e9))
-  (fp_line (start -5.6 5.1) (end 5.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp cf871147-17a7-4d2f-8482-a074df33262a))
-  (fp_line (start 5.6 -5.1) (end -5.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp fa5145b3-cc9b-4cf7-a51a-0069184d03dd))
-  (fp_line (start 4.15 -3.2) (end 4.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp 2168ca0c-ace4-4f6f-b2a6-c5208d0c7e65))
-  (fp_line (start -4.95 4.4) (end 4.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 263903e2-2283-40a0-a7c1-0f4e7d5169c8))
-  (fp_line (start 4.95 -3.2) (end 4.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 27c2b346-0490-432a-9975-d53f73c54a7f))
-  (fp_line (start -4.15 -1.6) (end 4.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 50d7558a-688a-4aa8-b6d9-f2a1957ff06c))
-  (fp_line (start -2 -0.892893) (end -1.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 54d3a67e-780d-4fea-9c1b-95e95938688a))
-  (fp_line (start 4.15 -1.6) (end 4.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 7250b70a-b0af-4e45-8552-b6c94d005995))
-  (fp_line (start -4.95 -3.2) (end -4.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 7d8b0198-8407-4cac-9e8e-43a3dfa6ca4a))
-  (fp_line (start -4.95 -3.2) (end -4.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp a686dea0-e202-42b1-9a3e-7a14b7465df8))
-  (fp_line (start -2.5 -1.6) (end -2 -0.892893) (layer "F.Fab") (width 0.1) (tstamp a78bf73c-a5ae-4505-af9f-cdd43664eb81))
-  (fp_line (start -4.15 -3.2) (end -4.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp f7f6f282-2411-4c0e-9903-2877edeb89e8))
-  (pad "1" smd roundrect (at -2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7012245c-c7fb-45c7-a935-e0889ce55959))
-  (pad "2" smd roundrect (at 0 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a4abd8cf-8ca6-4e72-9e64-24114022d18e))
-  (pad "3" smd roundrect (at 2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb773b3f-d76b-4c6e-80f6-95182dee61aa))
-  (pad "MP" smd roundrect (at 4.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp c37dcb3f-a891-4795-ba1b-abb14aec8f97))
-  (pad "MP" smd roundrect (at -4.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp e4ccc617-d298-4d66-afa3-389b3b159aac))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S3B-PH-SM4-TB_1x03-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal.kicad_mod
index 0431b3547..344b0c915 100644
--- a/Connector_JST.pretty/JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,52 +1,72 @@
-(footprint "JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S4B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 89e47fb1-01df-4012-bd8f-dbbbc3131278)
   )
-  (fp_text value "JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2780ce50-2846-405b-a3ae-1677aef6aa55)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -5.95 -3.2) (end -5.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -3.2) (end -5.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -1.6) (end 5.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -1.6) (end 5.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -3.2) (end 5.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.06 0.94) (end -6.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.06 -3.31) (end -5.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.04 -3.31) (end -5.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.04 -1.71) (end -3.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.76 -1.71) (end -3.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.06 0.94) (end 6.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.06 -3.31) (end 5.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.04 -3.31) (end 5.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.04 -1.71) (end 3.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.34 4.51) (end 4.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.95 4.4) (end 5.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.95 -3.2) (end -5.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.95 -3.2) (end 5.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.6 -5.1) (end -6.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.6 5.1) (end 6.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.6 5.1) (end 6.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.6 -5.1) (end -6.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 -1.6) (end -3 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 -0.892893) (end -2.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 5.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8b2ced8e-fc63-4717-80d7-3fd06dd9b185)
   )
-  (fp_line (start -6.06 -3.31) (end -5.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 0c3684dc-d636-4adb-915c-022f593cf25b))
-  (fp_line (start -5.04 -3.31) (end -5.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 2b1b5980-67c8-4653-b744-ad5148f54647))
-  (fp_line (start 5.04 -3.31) (end 5.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 38dedaa5-8ade-4fa2-982d-79c57fbc5854))
-  (fp_line (start 6.06 0.94) (end 6.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 49109f34-aaad-4d33-9beb-a79cc7c4915d))
-  (fp_line (start -5.04 -1.71) (end -3.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 6b4f80c2-25f8-40f2-9e39-af43624a8f37))
-  (fp_line (start -3.76 -1.71) (end -3.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp bd2f03da-78cf-488b-ac03-c4f1067d6cd1))
-  (fp_line (start -6.06 0.94) (end -6.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp cabb1d3c-5667-4e96-aa0d-be18ef8d0aef))
-  (fp_line (start -4.34 4.51) (end 4.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp d7b83fbc-fba0-4a4f-8b9f-88a4ba79ccad))
-  (fp_line (start 5.04 -1.71) (end 3.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp eb5cc91d-060c-423c-99a5-1034b6d27e87))
-  (fp_line (start 6.06 -3.31) (end 5.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp fd58feb8-f13f-4507-a984-1e022652f6f7))
-  (fp_line (start -6.6 -5.1) (end -6.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 7966c26f-ecdd-4da1-a8c8-97fec914a16f))
-  (fp_line (start 6.6 5.1) (end 6.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 7f49ec72-5e1a-48cf-8e6d-1ed8518310a6))
-  (fp_line (start 6.6 -5.1) (end -6.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 840e86cb-e040-4dd6-a22b-d8ad8e772ce6))
-  (fp_line (start -6.6 5.1) (end 6.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 89e16bb5-a97b-4e1b-b67b-17062eea16a5))
-  (fp_line (start -5.95 4.4) (end 5.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 28e2c903-80e3-4932-a1da-5d9c221d56db))
-  (fp_line (start 5.15 -1.6) (end 5.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 2e12e8b0-380c-40f2-b0dd-fb1aaf1e8fc2))
-  (fp_line (start -5.95 -3.2) (end -5.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 2e35e651-af77-432b-9b1f-989865476704))
-  (fp_line (start -5.15 -3.2) (end -5.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 2ea32757-4c75-4306-8f95-bcf2fb6a4a10))
-  (fp_line (start -5.15 -1.6) (end 5.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 38ccba76-57f9-46e7-b129-d9b025dfba25))
-  (fp_line (start 5.95 -3.2) (end 5.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 41bce768-38ff-4836-ab8c-965ac4d68cc7))
-  (fp_line (start 5.15 -3.2) (end 5.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp 8c9db3fd-1592-4752-8c89-85ea23b9da2c))
-  (fp_line (start -3 -0.892893) (end -2.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 937f5a74-407d-4b79-8d1d-ca8ce03d28f1))
-  (fp_line (start -5.95 -3.2) (end -5.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp daed9864-1400-4a9f-9c08-35d394b7cefd))
-  (fp_line (start -3.5 -1.6) (end -3 -0.892893) (layer "F.Fab") (width 0.1) (tstamp de31661d-9fc4-4796-80f1-cc989d84c049))
-  (pad "1" smd roundrect (at -3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3fafd0c9-9570-4296-bb69-c70f37215fab))
-  (pad "2" smd roundrect (at -1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9c71e19d-8821-4bd6-b4b6-ec9bdb3e54fc))
-  (pad "3" smd roundrect (at 1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2e0036f0-5c2c-42c4-810c-f779e253fb2b))
-  (pad "4" smd roundrect (at 3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ed0a867b-823a-447e-a89f-851d1f6c40a4))
-  (pad "MP" smd roundrect (at 5.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 66acf240-707a-40a5-bce9-ae31a0f63afd))
-  (pad "MP" smd roundrect (at -5.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp a7a78032-2da3-45d3-b202-76180c57f12f))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal.kicad_mod
index f514098bc..7ee33b2a9 100644
--- a/Connector_JST.pretty/JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,53 +1,73 @@
-(footprint "JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S5B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 11bb3465-4244-4511-8719-f9aad417bfb3)
   )
-  (fp_text value "JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6a4ea33c-ab92-46f8-85f4-f4c07db5a7cf)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -6.95 -3.2) (end -6.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.15 -3.2) (end -6.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.15 -1.6) (end 6.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.15 -1.6) (end 6.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.15 -3.2) (end 6.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.06 0.94) (end -7.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.06 -3.31) (end -6.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.04 -3.31) (end -6.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.04 -1.71) (end -4.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.76 -1.71) (end -4.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.06 0.94) (end 7.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.06 -3.31) (end 6.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.04 -3.31) (end 6.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.04 -1.71) (end 4.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.34 4.51) (end 5.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.95 4.4) (end 6.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.95 -3.2) (end -6.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.95 -3.2) (end 6.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.6 -5.1) (end -7.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.6 5.1) (end 7.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.6 5.1) (end 7.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.6 -5.1) (end -7.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.5 -1.6) (end -4 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.892893) (end -3.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 6.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ae650cc3-07e7-4824-bea6-8d5c622181c6)
   )
-  (fp_line (start -4.76 -1.71) (end -4.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 223b4a51-5c29-42ca-a04f-63d3bdbb9d20))
-  (fp_line (start 6.04 -3.31) (end 6.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 3e3f6505-9e33-4367-8223-8457095acb31))
-  (fp_line (start -5.34 4.51) (end 5.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp 48c49c40-3e4a-41db-8daa-3dd28ea58bd8))
-  (fp_line (start 6.04 -1.71) (end 4.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 52c1f69d-e2d4-44e3-bf30-88ef144c4581))
-  (fp_line (start -6.04 -1.71) (end -4.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 8148cd8d-2e13-4797-88a1-cd202e5edc03))
-  (fp_line (start -7.06 -3.31) (end -6.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 82ffa3db-226e-4a25-a94d-d4198b487222))
-  (fp_line (start -6.04 -3.31) (end -6.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp a8e55cb1-4dd8-4bd8-b544-d449c057aaf4))
-  (fp_line (start 7.06 0.94) (end 7.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp cc545138-e61f-4f6f-ac5b-b331cba3d4e7))
-  (fp_line (start 7.06 -3.31) (end 6.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp db5481bc-440b-4f66-8ffb-c3d8a52dce25))
-  (fp_line (start -7.06 0.94) (end -7.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp ea4c873c-6bd0-4a90-881c-11892a76dfca))
-  (fp_line (start 7.6 -5.1) (end -7.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 12834bc6-7716-4567-8645-a5b1fab4b76c))
-  (fp_line (start 7.6 5.1) (end 7.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 75eb3bdb-c3ec-4b26-9946-34e899cc7334))
-  (fp_line (start -7.6 -5.1) (end -7.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp a39ce3d4-d88b-4828-8b8c-1c4532a6a56b))
-  (fp_line (start -7.6 5.1) (end 7.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp e9504f69-0d38-40cb-8d8c-bb9192e0da43))
-  (fp_line (start -6.95 4.4) (end 6.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 32721cfc-f394-4e48-8bce-299a6adaddf1))
-  (fp_line (start 6.95 -3.2) (end 6.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 42adb41d-85b8-42b8-a386-6fec92809c3b))
-  (fp_line (start 6.15 -1.6) (end 6.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 4824b4fd-a226-493a-a03d-571c2883ec4d))
-  (fp_line (start -4.5 -1.6) (end -4 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 56330703-8e74-4be5-84c3-f17d60490dbe))
-  (fp_line (start -6.15 -3.2) (end -6.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 61ce7baa-03cb-49bd-bd5a-6c0f262f58e8))
-  (fp_line (start 6.15 -3.2) (end 6.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp a381e329-78d6-459f-beb3-ae96fbd3d11a))
-  (fp_line (start -4 -0.892893) (end -3.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp a62c2eb2-2aca-47d3-8d90-aa4f023993ea))
-  (fp_line (start -6.95 -3.2) (end -6.95 4.4) (layer "F.Fab") (width 0.1) (tstamp c6535f86-a393-46a4-8590-677de4f539f4))
-  (fp_line (start -6.95 -3.2) (end -6.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp d1657496-61fe-4a2b-a7dd-e2bdec35b2a4))
-  (fp_line (start -6.15 -1.6) (end 6.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp de3cf2d8-f52a-4df2-b484-fe0c3f2de2b9))
-  (pad "1" smd roundrect (at -4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1af17da7-ab7f-4142-b303-18a4b9f75fed))
-  (pad "2" smd roundrect (at -2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c8e740ad-8456-4d8b-a285-c32c5fd96232))
-  (pad "3" smd roundrect (at 0 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ac648dae-fd01-4191-9b04-ad16d786fe78))
-  (pad "4" smd roundrect (at 2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d91ce8c1-0a49-4542-b13d-4817d30d16cb))
-  (pad "5" smd roundrect (at 4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e3c15bf-3736-45d0-b6cd-efb5ce43687d))
-  (pad "MP" smd roundrect (at 6.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 8f9cecad-dc62-40f1-bab3-94a04e27100d))
-  (pad "MP" smd roundrect (at -6.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 9e5a97bb-2e55-4a4b-b1df-af4e5573ce72))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S5B-PH-SM4-TB_1x05-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal.kicad_mod
index 23a4c8bc4..e8a8fecef 100644
--- a/Connector_JST.pretty/JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,54 +1,74 @@
-(footprint "JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S6B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a8a9aadb-0778-4e30-a9ae-8648891b84de)
   )
-  (fp_text value "JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a482897b-ad00-4a65-9dbb-645e207cbd36)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -7.95 -3.2) (end -7.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.15 -3.2) (end -7.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.15 -1.6) (end 7.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.15 -1.6) (end 7.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.15 -3.2) (end 7.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.06 0.94) (end -8.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.06 -3.31) (end -7.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.04 -3.31) (end -7.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.04 -1.71) (end -5.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.76 -1.71) (end -5.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.06 0.94) (end 8.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.06 -3.31) (end 7.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.04 -3.31) (end 7.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.04 -1.71) (end 5.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.34 4.51) (end 6.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.95 4.4) (end 7.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.95 -3.2) (end -7.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.95 -3.2) (end 7.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.6 -5.1) (end -8.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.6 5.1) (end 8.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.6 5.1) (end 8.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.6 -5.1) (end -8.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 -1.6) (end -5 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.892893) (end -4.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 7.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 046329c1-294a-4660-8c29-ea3c20e3c242)
   )
-  (fp_line (start 7.04 -3.31) (end 7.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 08409786-ae4a-42cf-b291-9cdf6af81a3b))
-  (fp_line (start -5.76 -1.71) (end -5.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 0c2ca71f-d3ff-4177-b315-25e41e1e5ad1))
-  (fp_line (start -8.06 -3.31) (end -7.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 3373da61-7da2-4bd2-bf27-d74814ce9e46))
-  (fp_line (start -7.04 -1.71) (end -5.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 7e8d9b32-9929-430f-9d88-e6412cce256c))
-  (fp_line (start -7.04 -3.31) (end -7.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 988130e3-9f52-4523-84d3-39ac6744d05e))
-  (fp_line (start 7.04 -1.71) (end 5.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp cc99fe7e-6174-4391-bf87-9cb7199dab7d))
-  (fp_line (start -8.06 0.94) (end -8.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp d0ffaa4d-21c4-4457-b1ef-aa9aeb975fdd))
-  (fp_line (start -6.34 4.51) (end 6.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp fa197021-398a-4ab9-a790-5913f21c7eb8))
-  (fp_line (start 8.06 0.94) (end 8.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp fb6ff262-3964-4dfd-bd9a-6b8b4c7bb03f))
-  (fp_line (start 8.06 -3.31) (end 7.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp fe5e7370-15f3-46d1-8e32-199ff216c357))
-  (fp_line (start -8.6 5.1) (end 8.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 2992ce8d-ede8-4a8c-89f1-deb216066a1c))
-  (fp_line (start 8.6 -5.1) (end -8.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 6fcc70f1-66c4-4f9e-96b8-05580d4387bf))
-  (fp_line (start -8.6 -5.1) (end -8.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 737d7220-b199-4b59-bf96-02d63078a6dd))
-  (fp_line (start 8.6 5.1) (end 8.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp fc0e7329-f70e-4a57-b857-8ea5dd642a29))
-  (fp_line (start -7.95 4.4) (end 7.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 02b451a0-6280-4d27-a520-08d7c296f68f))
-  (fp_line (start -7.95 -3.2) (end -7.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 0638e054-a97b-4ac1-b3c6-e028f77c9136))
-  (fp_line (start 7.15 -1.6) (end 7.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 53141c22-5cc8-44eb-b430-d1ba3b7b2cff))
-  (fp_line (start 7.95 -3.2) (end 7.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 5d978ec7-0c6a-49b0-99e4-1eea111d37c7))
-  (fp_line (start -7.15 -1.6) (end 7.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 68edeac9-4175-4544-9886-1d7de6f3e39b))
-  (fp_line (start -5.5 -1.6) (end -5 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 8b43d670-1551-49c1-bc9c-89ede97f07d6))
-  (fp_line (start 7.15 -3.2) (end 7.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp bb7f97a9-6e46-47f6-8151-62190509996f))
-  (fp_line (start -7.95 -3.2) (end -7.95 4.4) (layer "F.Fab") (width 0.1) (tstamp c1265575-d87d-4a6a-884c-d552d893f509))
-  (fp_line (start -7.15 -3.2) (end -7.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp d13dd482-84e8-42af-953e-4e68f070537a))
-  (fp_line (start -5 -0.892893) (end -4.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp f07dd6f6-6103-4b49-9e32-ccf997004113))
-  (pad "1" smd roundrect (at -5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6cd54d2b-4ecd-4b76-8a0b-547685a8ad26))
-  (pad "2" smd roundrect (at -3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e4cdb496-12c9-4179-9b13-03667b002e81))
-  (pad "3" smd roundrect (at -1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bf247a72-2b29-43fc-8a8c-9f11c8e3f2a9))
-  (pad "4" smd roundrect (at 1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 02a7eaa5-d903-4a16-a54e-02d3d33eb871))
-  (pad "5" smd roundrect (at 3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 948c41d8-20e7-400a-85c1-bfa2094c2ee0))
-  (pad "6" smd roundrect (at 5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 803e9a00-e737-4277-84bd-9ed27284a0b0))
-  (pad "MP" smd roundrect (at 7.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 02a23d80-fe71-4179-a33f-902c9116621c))
-  (pad "MP" smd roundrect (at -7.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 46a610b8-4ac8-4fe8-8779-4679f78da334))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S6B-PH-SM4-TB_1x06-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal.kicad_mod
index 81e7abecb..12235cdb2 100644
--- a/Connector_JST.pretty/JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,55 +1,75 @@
-(footprint "JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S7B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8c7df588-486e-45b9-979c-2574ba26e0dc)
   )
-  (fp_text value "JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c79b8727-1602-47be-9f55-5a2be9b4e560)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -8.95 -3.2) (end -8.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.15 -3.2) (end -8.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.15 -1.6) (end 8.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.15 -1.6) (end 8.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.15 -3.2) (end 8.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.06 0.94) (end -9.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.06 -3.31) (end -8.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.04 -3.31) (end -8.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.04 -1.71) (end -6.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.76 -1.71) (end -6.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.06 0.94) (end 9.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.06 -3.31) (end 8.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.04 -3.31) (end 8.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.04 -1.71) (end 6.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.34 4.51) (end 7.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.95 4.4) (end 8.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.95 -3.2) (end -8.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.95 -3.2) (end 8.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.6 -5.1) (end -9.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.6 5.1) (end 9.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.6 5.1) (end 9.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.6 -5.1) (end -9.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 -1.6) (end -6 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -0.892893) (end -5.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 8.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 719c89b1-1a5b-43aa-9786-6da22488f462)
   )
-  (fp_line (start 8.04 -3.31) (end 8.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 0024440b-fe2c-41ca-b930-f9bc8a377ce0))
-  (fp_line (start -6.76 -1.71) (end -6.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 22a12361-7824-4416-9b42-a697ab5818de))
-  (fp_line (start 8.04 -1.71) (end 6.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 7a3820a7-8a27-4aa7-9613-16f960a2f8cf))
-  (fp_line (start -9.06 0.94) (end -9.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 7f363e02-ab98-42aa-b2a4-6acef3cd0517))
-  (fp_line (start -8.04 -3.31) (end -8.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 80421d45-f711-487f-8662-b6e6fcf06bfe))
-  (fp_line (start 9.06 0.94) (end 9.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 8318eeae-8a47-4d0d-9432-ac19dab1fd88))
-  (fp_line (start -9.06 -3.31) (end -8.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp a352f374-9a8c-49c8-8757-9741d829efb4))
-  (fp_line (start -7.34 4.51) (end 7.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp bf93017a-36e7-480d-9a6f-53d340c69ab2))
-  (fp_line (start -8.04 -1.71) (end -6.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp cf7b5ca9-eeb6-4118-b350-b3f7119d032b))
-  (fp_line (start 9.06 -3.31) (end 8.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp df07858e-cb2f-456f-be8f-a6f8e4fb9c69))
-  (fp_line (start -9.6 -5.1) (end -9.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 62d1fdc2-f805-4f35-a775-ba8feb8cd362))
-  (fp_line (start 9.6 -5.1) (end -9.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 73775c8b-041e-48fc-93ea-3f4b1061ec50))
-  (fp_line (start -9.6 5.1) (end 9.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp d01658a3-0afa-4047-ab81-e2db115a87e8))
-  (fp_line (start 9.6 5.1) (end 9.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp dfd47390-9d9d-439c-a327-8e1097a2641a))
-  (fp_line (start 8.95 -3.2) (end 8.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 0c5eb80d-d48a-4c39-b2d0-c6ef87825d74))
-  (fp_line (start -8.15 -3.2) (end -8.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 4d88564c-951d-4dd2-8064-f7a3ead4577d))
-  (fp_line (start -8.95 -3.2) (end -8.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 4dee9a6e-e7a4-4aef-b7f4-9261a8e16c7a))
-  (fp_line (start -6.5 -1.6) (end -6 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 56606e1e-fca8-46d8-9c78-7241b0afe8be))
-  (fp_line (start -6 -0.892893) (end -5.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 87a06e74-1fb3-402d-af67-78864e943500))
-  (fp_line (start -8.95 -3.2) (end -8.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 93217780-b8e3-4867-bc07-c713e6f9c3de))
-  (fp_line (start -8.15 -1.6) (end 8.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp c9e8109a-dc9f-4ad9-abec-ab1d16253fa9))
-  (fp_line (start 8.15 -3.2) (end 8.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp ca6b280e-1873-4888-a0c8-3f38f5187a0e))
-  (fp_line (start 8.15 -1.6) (end 8.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp f0a15883-674e-4ce8-be21-74730f570e44))
-  (fp_line (start -8.95 4.4) (end 8.95 4.4) (layer "F.Fab") (width 0.1) (tstamp fd551404-8aeb-4bc4-b7d2-3e21e4f59059))
-  (pad "1" smd roundrect (at -6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b9ed193e-e8d5-499b-b0bb-89e740714fbe))
-  (pad "2" smd roundrect (at -4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9ef17422-a24f-4ee8-9286-883ffd8ac504))
-  (pad "3" smd roundrect (at -2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7e904036-ca7c-46ea-8473-3b438054f086))
-  (pad "4" smd roundrect (at 0 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f816918a-6630-464f-9c45-9bb031611113))
-  (pad "5" smd roundrect (at 2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bd76f448-a07c-4aad-bbcf-4ae8f69db863))
-  (pad "6" smd roundrect (at 4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 45ab73a9-3dbd-48ae-a4cb-11c25427022d))
-  (pad "7" smd roundrect (at 6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9bc8e2b4-f760-468e-b969-ddd89dfff0ec))
-  (pad "MP" smd roundrect (at 8.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 31fd6fcc-d813-4594-87ab-370449044765))
-  (pad "MP" smd roundrect (at -8.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp d573b84f-3be4-4c7c-907c-29381c1d7051))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S7B-PH-SM4-TB_1x07-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal.kicad_mod
index 929cffd6d..7631bfdbf 100644
--- a/Connector_JST.pretty/JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,56 +1,76 @@
-(footprint "JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S8B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e62d2f04-aedb-4304-b117-f3991aac7d51)
   )
-  (fp_text value "JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2d85c3b1-a88b-474e-b9c1-49db36b91858)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -9.95 -3.2) (end -9.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.15 -3.2) (end -9.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.15 -1.6) (end 9.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.15 -1.6) (end 9.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.15 -3.2) (end 9.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.06 0.94) (end -10.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.06 -3.31) (end -9.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.04 -3.31) (end -9.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.04 -1.71) (end -7.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.76 -1.71) (end -7.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.06 0.94) (end 10.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.06 -3.31) (end 9.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.04 -3.31) (end 9.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.04 -1.71) (end 7.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.34 4.51) (end 8.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.95 4.4) (end 9.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.95 -3.2) (end -9.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.95 -3.2) (end 9.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.6 -5.1) (end -10.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.6 5.1) (end 10.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.6 5.1) (end 10.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.6 -5.1) (end -10.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.5 -1.6) (end -7 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -0.892893) (end -6.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 5 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 7 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 9.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 09db891c-a397-4384-b2da-38aae2a0e7d4)
   )
-  (fp_line (start 9.04 -3.31) (end 9.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 1fc97d1c-41ce-4342-a725-4c5f4740471c))
-  (fp_line (start -10.06 0.94) (end -10.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 35e01fad-7c60-482b-8e87-cd4d1fcbf458))
-  (fp_line (start -10.06 -3.31) (end -9.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp abc42a61-aacd-44a4-88d9-26956a7750c6))
-  (fp_line (start -9.04 -1.71) (end -7.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp aee72e43-6fc2-40d1-a88a-3ebe6511eefa))
-  (fp_line (start 10.06 0.94) (end 10.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp b2ac8bcc-6403-43ad-a759-e2d3b8e4123f))
-  (fp_line (start -9.04 -3.31) (end -9.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp c23f2f6e-93a8-4c73-a852-47b52ce1a695))
-  (fp_line (start -7.76 -1.71) (end -7.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp d2716235-1191-4cb5-9569-92f4545275e8))
-  (fp_line (start 9.04 -1.71) (end 7.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp d436d865-8d49-4a4a-aaaa-1efdb1fa4c18))
-  (fp_line (start -8.34 4.51) (end 8.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp d9fce4b4-acc2-4179-b63c-fa4cef86dace))
-  (fp_line (start 10.06 -3.31) (end 9.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp f5070334-81b3-4935-ac84-e782b98062a3))
-  (fp_line (start 10.6 -5.1) (end -10.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 185157b1-0975-4110-adaa-2fa627f570f1))
-  (fp_line (start -10.6 5.1) (end 10.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 41175f2d-7077-4ad8-9b7d-9f953ecf798a))
-  (fp_line (start -10.6 -5.1) (end -10.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 9091d72b-8b8d-4e60-81d8-3d66e3b6a942))
-  (fp_line (start 10.6 5.1) (end 10.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp ce3656a1-3a81-48e4-8a2b-a48c237b9e04))
-  (fp_line (start -9.95 -3.2) (end -9.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 2114d2b3-1838-439b-b512-aba570f2f6cb))
-  (fp_line (start -7.5 -1.6) (end -7 -0.892893) (layer "F.Fab") (width 0.1) (tstamp 388020d4-cec5-4fb1-8ddc-d668d1a431a3))
-  (fp_line (start 9.15 -1.6) (end 9.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 7c39e4f5-73df-4ad8-8e46-a2a3693b43c0))
-  (fp_line (start -9.15 -3.2) (end -9.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 89daef1a-a879-4a64-9175-c760e46f2fa2))
-  (fp_line (start -9.95 -3.2) (end -9.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 8db9f052-026e-474d-9476-975c992072ec))
-  (fp_line (start 9.95 -3.2) (end 9.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 97d94b12-33f5-47d6-bb14-ed57d57d555d))
-  (fp_line (start -7 -0.892893) (end -6.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp a614f30f-11ba-478f-9727-dd629d7f5630))
-  (fp_line (start -9.95 4.4) (end 9.95 4.4) (layer "F.Fab") (width 0.1) (tstamp afa5ac44-52ec-4c5d-88f3-dd290bd220b1))
-  (fp_line (start 9.15 -3.2) (end 9.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp ce0decfb-1fae-4c91-af24-ee122915592a))
-  (fp_line (start -9.15 -1.6) (end 9.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp ee9fa57b-91ff-467e-a9e3-fc6ea3a779eb))
-  (pad "1" smd roundrect (at -7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 150e4222-f259-4df2-8fa5-e4e3c3fdf979))
-  (pad "2" smd roundrect (at -5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e786da8f-8ae4-4235-a919-3f12ef5e56e5))
-  (pad "3" smd roundrect (at -3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6a688cc4-ee02-4e3f-b35a-4210e2e71c56))
-  (pad "4" smd roundrect (at -1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 28c4674b-0c97-4ed9-87fd-109250473a84))
-  (pad "5" smd roundrect (at 1 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5bc7d56-6b14-4db0-95aa-e404471b582f))
-  (pad "6" smd roundrect (at 3 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 378149c8-576e-4afe-ab95-11c6e3ed31ed))
-  (pad "7" smd roundrect (at 5 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4250df3c-ed3d-41a6-901f-b9595bc0185c))
-  (pad "8" smd roundrect (at 7 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d9847eb1-a82c-4826-a4e1-8266374d56d8))
-  (pad "MP" smd roundrect (at 9.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 7936c2e5-dfe1-4bc6-b4d1-4562fd4663f0))
-  (pad "MP" smd roundrect (at -9.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp c221f832-e1d0-402b-a6a9-0ebf3c7fa762))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S8B-PH-SM4-TB_1x08-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal.kicad_mod
index 566e51f67..e2075b3e7 100644
--- a/Connector_JST.pretty/JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal.kicad_mod
@@ -1,57 +1,77 @@
-(footprint "JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST PH series connector, S9B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST PH top entry")
+  (tags "connector JST PH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.8) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.8) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ebeb7333-47df-4fc2-be3f-3d63496a889b)
   )
-  (fp_text value "JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal" (at 0 5.8) (layer "F.Fab")
+  (fp_text value JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal (at 0 5.8) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8064cd32-32da-4157-8a3e-a537606f8344)
   )
-  (fp_text user "${REFERENCE}" (at 0 1.5) (layer "F.Fab")
+  (fp_line (start -10.95 -3.2) (end -10.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.15 -3.2) (end -10.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.15 -1.6) (end 10.15 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.15 -1.6) (end 10.15 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.15 -3.2) (end 10.95 -3.2)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.06 0.94) (end -11.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.06 -3.31) (end -10.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.04 -3.31) (end -10.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.04 -1.71) (end -8.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.76 -1.71) (end -8.76 -4.6)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.06 0.94) (end 11.06 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.06 -3.31) (end 10.04 -3.31)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.04 -3.31) (end 10.04 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.04 -1.71) (end 8.76 -1.71)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.34 4.51) (end 9.34 4.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.95 4.4) (end 10.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.95 -3.2) (end -10.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.95 -3.2) (end 10.95 4.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.6 -5.1) (end -11.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.6 5.1) (end 11.6 5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.6 5.1) (end 11.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.6 -5.1) (end -11.6 -5.1)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.5 -1.6) (end -8 -0.892893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 -0.892893) (end -7.5 -1.6)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 4 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 6 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 8 -2.85) (size 1 3.5) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (pad MP smd roundrect (at 10.35 2.9) (size 1.5 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.166667))
+  (fp_text user ${REFERENCE} (at 0 1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b74e4b74-47da-4a32-9529-5bb50565ad96)
   )
-  (fp_line (start -10.04 -3.31) (end -10.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 20cd01a6-63bd-4597-a983-e9b9b5c38d60))
-  (fp_line (start 10.04 -1.71) (end 8.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 525240de-5b1d-4f50-80ab-aea084a0fa23))
-  (fp_line (start -10.04 -1.71) (end -8.76 -1.71) (layer "F.SilkS") (width 0.12) (tstamp 54f2a960-7f47-471f-a3a1-c1d7550e3770))
-  (fp_line (start -9.34 4.51) (end 9.34 4.51) (layer "F.SilkS") (width 0.12) (tstamp 6916d461-670b-461e-b646-a1b323701c3b))
-  (fp_line (start -8.76 -1.71) (end -8.76 -4.6) (layer "F.SilkS") (width 0.12) (tstamp 7b70709a-4d54-4ad9-9539-f3b2c2f0a941))
-  (fp_line (start -11.06 -3.31) (end -10.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp 926b2799-6327-481d-b893-8dc2c67a5cab))
-  (fp_line (start 10.04 -3.31) (end 10.04 -1.71) (layer "F.SilkS") (width 0.12) (tstamp ac4d5fd3-b60b-4f22-9e7c-734411c339ee))
-  (fp_line (start -11.06 0.94) (end -11.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp ba8e488a-51f7-4705-a477-f6807a9694d3))
-  (fp_line (start 11.06 -3.31) (end 10.04 -3.31) (layer "F.SilkS") (width 0.12) (tstamp dd0d98e6-ef41-4e04-92e1-5f9313cfe6d2))
-  (fp_line (start 11.06 0.94) (end 11.06 -3.31) (layer "F.SilkS") (width 0.12) (tstamp e9936b33-7836-4a03-b0cc-8720c1ac5c7e))
-  (fp_line (start -11.6 -5.1) (end -11.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 073588de-cb9f-415d-ab98-1de0a4c94898))
-  (fp_line (start 11.6 -5.1) (end -11.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 169823e8-2e8b-4728-a739-7d894c8d8672))
-  (fp_line (start 11.6 5.1) (end 11.6 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 17ab3cd1-18ba-4751-9985-4aa57e8f8087))
-  (fp_line (start -11.6 5.1) (end 11.6 5.1) (layer "F.CrtYd") (width 0.05) (tstamp 22f3eb9a-7db3-45c1-a5e6-b93ed294591b))
-  (fp_line (start -8 -0.892893) (end -7.5 -1.6) (layer "F.Fab") (width 0.1) (tstamp 16726892-7c18-454a-9d4a-54238810a8a6))
-  (fp_line (start -10.95 -3.2) (end -10.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 18173948-ec3d-43d8-952e-90020628e0bd))
-  (fp_line (start 10.95 -3.2) (end 10.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 27f6ab98-2dde-476a-ac6b-cc44eaaacf22))
-  (fp_line (start 10.15 -1.6) (end 10.15 -3.2) (layer "F.Fab") (width 0.1) (tstamp 472761c7-1863-4fda-9bb3-25376d9ada64))
-  (fp_line (start -10.95 4.4) (end 10.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 75464b51-2e86-4827-bfa4-f85d065738f6))
-  (fp_line (start 10.15 -3.2) (end 10.95 -3.2) (layer "F.Fab") (width 0.1) (tstamp 7c65a523-2991-4ec6-b6b7-f45291bd1243))
-  (fp_line (start -10.15 -1.6) (end 10.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp 8b0ab4fb-d2ac-454d-90e5-dfccdc369095))
-  (fp_line (start -10.15 -3.2) (end -10.15 -1.6) (layer "F.Fab") (width 0.1) (tstamp a33a7462-e6c4-4e94-b24c-5144826cc7f4))
-  (fp_line (start -8.5 -1.6) (end -8 -0.892893) (layer "F.Fab") (width 0.1) (tstamp b7e3d625-f333-4eb2-b960-7d7016eb7c8a))
-  (fp_line (start -10.95 -3.2) (end -10.95 4.4) (layer "F.Fab") (width 0.1) (tstamp f0621605-d168-4c69-a40f-16df760e45e1))
-  (pad "1" smd roundrect (at -8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a3220305-484b-462d-893a-a29d011793e7))
-  (pad "2" smd roundrect (at -6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 573fcd28-7c44-44c2-82f9-3899a02857d5))
-  (pad "3" smd roundrect (at -4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bb944828-74f4-4f63-a374-b016562e085d))
-  (pad "4" smd roundrect (at -2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 95c1e5d3-afdc-4429-8c61-175e813ff8b7))
-  (pad "5" smd roundrect (at 0 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aaa3cade-1fe4-41aa-a86d-0da4fa52ce67))
-  (pad "6" smd roundrect (at 2 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dbb9c54d-e5ea-46e8-8ae8-9dee2f7dc071))
-  (pad "7" smd roundrect (at 4 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99d447d4-2cc3-4dc5-9ce5-ed88efad7035))
-  (pad "8" smd roundrect (at 6 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f2dd3b1d-36a4-4796-955a-7c12fe3a9f19))
-  (pad "9" smd roundrect (at 8 -2.85) (size 1 3.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1cb24386-5157-4bd0-882f-04d954d68601))
-  (pad "MP" smd roundrect (at -10.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 616ff9c1-1c20-4eb7-8a0e-4cc324f5aa5f))
-  (pad "MP" smd roundrect (at 10.35 2.9) (size 1.5 3.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.166667) (tstamp 868e5d31-e57d-4aaa-aafa-d66926a4563c))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_S9B-PH-SM4-TB_1x09-1MP_P2.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod
index 680db3d4c..fccb7a553 100644
--- a/Connector_JST.pretty/JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal.kicad_mod
@@ -1,44 +1,52 @@
-(footprint "JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814B6)
+(footprint JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SFH series connector, SM02B-SFHRS-TF (http://www.jst-mfg.com/product/pdf/eng/eSFH.pdf), generated with kicad-footprint-generator")
   (tags "connector JST SFH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -4.42) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -4.42) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6b0deb9c-8686-4932-9442-a58129bb39c4)
   )
-  (fp_text value "JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal" (at 0 4.42) (layer "F.Fab")
+  (fp_text value JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal (at 0 4.42) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp dbe0fee4-56bb-40a1-aa1c-2dea082d008c)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -2.6 -2.875) (end 2.6 -2.875)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.6 3.025) (end 2.6 3.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.6 -2.875) (end -2.6 3.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.6 -2.875) (end 2.6 3.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.315 -2.985) (end 1.315 -2.985)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.515 3.135) (end 1.515 3.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.71 -1.165) (end -2.71 1.215)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.71 -1.165) (end 2.71 1.215)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.12 -3.72) (end -3.12 3.72)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.12 3.72) (end 3.12 3.72)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.12 3.72) (end 3.12 -3.72)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.12 -3.72) (end -3.12 -3.72)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.35 -4.073553) (end -2.1 -3.72)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.1 -3.72) (end -1.85 -4.073553)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -4.073553) (end -2.35 -4.073553)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.1 -2.325) (size 1.05 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
+  (pad 2 smd roundrect (at 2.1 -2.325) (size 1.05 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
+  (pad MP smd roundrect (at -2.2 2.35) (size 0.85 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 2.2 2.35) (size 0.85 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c563f46f-41b5-45c8-a2cc-e39b44b8b55d)
   )
-  (fp_line (start 2.71 -1.165) (end 2.71 1.215) (layer "F.SilkS") (width 0.12) (tstamp 0433e818-caba-4acb-a27a-5bdb98becd19))
-  (fp_line (start -1.85 -4.073553) (end -2.35 -4.073553) (layer "F.SilkS") (width 0.12) (tstamp 37729b78-bcec-46bb-8f28-956fb3658bdb))
-  (fp_line (start -1.315 -2.985) (end 1.315 -2.985) (layer "F.SilkS") (width 0.12) (tstamp 3799bbf7-0dc9-4675-ad5f-0e947db4769d))
-  (fp_line (start -2.1 -3.72) (end -1.85 -4.073553) (layer "F.SilkS") (width 0.12) (tstamp a32add5d-f6ee-48c0-8485-19e4fd0d9b0c))
-  (fp_line (start -2.71 -1.165) (end -2.71 1.215) (layer "F.SilkS") (width 0.12) (tstamp caa04b5a-a81a-400b-8570-ed97d61a787d))
-  (fp_line (start -2.35 -4.073553) (end -2.1 -3.72) (layer "F.SilkS") (width 0.12) (tstamp e52ed25f-29ef-44f6-8651-b0244f9e6c67))
-  (fp_line (start -1.515 3.135) (end 1.515 3.135) (layer "F.SilkS") (width 0.12) (tstamp feb99b72-8e41-407d-891a-f620b687e908))
-  (fp_line (start -3.12 3.72) (end 3.12 3.72) (layer "F.CrtYd") (width 0.05) (tstamp 2a3e9050-2a47-4ca8-8765-8ccde5c08299))
-  (fp_line (start -3.12 -3.72) (end -3.12 3.72) (layer "F.CrtYd") (width 0.05) (tstamp 4ddfe100-32f7-406f-ac4a-6df0820e577a))
-  (fp_line (start 3.12 -3.72) (end -3.12 -3.72) (layer "F.CrtYd") (width 0.05) (tstamp 741794f2-a04a-43a9-a786-42c7a609409c))
-  (fp_line (start 3.12 3.72) (end 3.12 -3.72) (layer "F.CrtYd") (width 0.05) (tstamp e50da5f3-e516-43cc-8635-71ff797b345b))
-  (fp_line (start -2.6 -2.875) (end -2.6 3.025) (layer "F.Fab") (width 0.1) (tstamp 29bcb6b3-b104-43cc-8bbe-7725be089341))
-  (fp_line (start -2.35 -4.073553) (end -2.1 -3.72) (layer "F.Fab") (width 0.1) (tstamp 354f18a4-91a9-4478-9e9f-9f6e4d1d5ae5))
-  (fp_line (start 2.6 -2.875) (end 2.6 3.025) (layer "F.Fab") (width 0.1) (tstamp 36f3c744-fd51-4495-929f-a2db5acb2738))
-  (fp_line (start -1.85 -4.073553) (end -2.35 -4.073553) (layer "F.Fab") (width 0.1) (tstamp 4a31ad9d-d34f-4291-94fe-025e6ac24c90))
-  (fp_line (start -2.1 -3.72) (end -1.85 -4.073553) (layer "F.Fab") (width 0.1) (tstamp 64e9bce7-aaa0-4b6f-bc80-2fcf675f337f))
-  (fp_line (start -2.6 3.025) (end 2.6 3.025) (layer "F.Fab") (width 0.1) (tstamp bce0a34b-6818-4caf-a44c-3cf1b10c02e1))
-  (fp_line (start -2.6 -2.875) (end 2.6 -2.875) (layer "F.Fab") (width 0.1) (tstamp cfc9a9a9-4c4a-48f4-ae73-088464da0f2c))
-  (pad "1" smd roundrect (at -2.1 -2.325) (size 1.05 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.238095) (tstamp 553fe367-9d65-41cd-86cb-cd04604bf338))
-  (pad "2" smd roundrect (at 2.1 -2.325) (size 1.05 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.238095) (tstamp f5fdd0cc-ef05-457c-823f-c078d86947e5))
-  (pad "MP" smd roundrect (at 2.2 2.35) (size 0.85 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 07e7a107-3e9e-444b-b2c9-2107e8e6a097))
-  (pad "MP" smd roundrect (at -2.2 2.35) (size 0.85 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 40b7134b-5e6d-445e-9027-7d4b09920f06))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SFH_SM02B-SFHRS-TF_1x02-1MP_P4.20mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal.kicad_mod
index 3d5587092..78ea3d6c7 100644
--- a/Connector_JST.pretty/JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,44 +1,58 @@
-(footprint "JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM02B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1e77aa76-2d0b-47e1-865b-141835029752)
   )
-  (fp_text value "JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 491bc834-f252-4df3-87f7-87c8aecd04d6)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -2.4 -1.3) (end 2.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.51 0.34) (end -2.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.51 -1.41) (end -1.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.06 -1.41) (end -1.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.51 0.34) (end 2.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.51 -1.41) (end 1.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.51 2.56) (end -2.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.51 3.11) (end 2.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.51 3.11) (end 2.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.4 3) (end 2.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.4 -1.3) (end -2.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.4 -1.3) (end 2.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.9 -2.8) (end -2.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.9 3.5) (end 2.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.9 3.5) (end 2.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.9 -2.8) (end -2.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1 -1.3) (end -0.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.592893) (end 0 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 1.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2228f855-9274-4fe2-9204-d6d6016e4215)
   )
-  (fp_line (start 2.51 -1.41) (end 1.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 280b66ae-74ef-4595-b4fd-44d2301b31df))
-  (fp_line (start 2.51 0.34) (end 2.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 28d0aa19-5374-4372-9819-1cd97906b038))
-  (fp_line (start 2.51 3.11) (end 2.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 4722a133-1aa1-40ae-b2fb-54ffe0ba12b8))
-  (fp_line (start -1.06 -1.41) (end -1.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 48ddcbe3-8602-434b-a47b-493732786587))
-  (fp_line (start -2.51 3.11) (end 2.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 4afa7d9b-c4a3-4fad-8252-954aeb7ddae4))
-  (fp_line (start -2.51 0.34) (end -2.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 52a1c237-599b-4e3e-82de-2585f32dec3c))
-  (fp_line (start -2.51 -1.41) (end -1.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 90e02f03-de59-439f-b566-bc6d702f9f56))
-  (fp_line (start -2.51 2.56) (end -2.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp d99885e3-ca31-46c8-88af-5d8069491529))
-  (fp_line (start 2.9 3.5) (end 2.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 0c969889-00d3-451d-ac76-42d3932d8459))
-  (fp_line (start -2.9 3.5) (end 2.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 1ff8aaf0-9bec-451e-9d0a-a07f3216b329))
-  (fp_line (start 2.9 -2.8) (end -2.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp ba1a3e3a-7a72-479d-8f54-27bc34b47796))
-  (fp_line (start -2.9 -2.8) (end -2.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp c728696d-f674-44d4-8912-403642e55807))
-  (fp_line (start -0.5 -0.592893) (end 0 -1.3) (layer "F.Fab") (width 0.1) (tstamp 058e7f3b-cbfd-4b22-a4a4-002043d36e55))
-  (fp_line (start 2.4 -1.3) (end 2.4 3) (layer "F.Fab") (width 0.1) (tstamp 39cb0721-97c1-4b43-aef6-4529bc4c9d61))
-  (fp_line (start -1 -1.3) (end -0.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 6b09916d-d5c6-46c4-92d1-97815119d0f1))
-  (fp_line (start -2.4 -1.3) (end -2.4 3) (layer "F.Fab") (width 0.1) (tstamp 6ba26a11-9daa-49bf-b187-1d3e503834a3))
-  (fp_line (start -2.4 -1.3) (end 2.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp d3f0014f-3aba-4867-8bc5-b78d4f079829))
-  (fp_line (start -2.4 3) (end 2.4 3) (layer "F.Fab") (width 0.1) (tstamp ef82ba12-6e0f-474c-823e-542550c331b5))
-  (pad "1" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d746a8b5-a79f-4d0a-82b6-d15510d1f040))
-  (pad "2" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 52aa5e87-2af5-4816-bf1b-177eeb226140))
-  (pad "MP" smd roundrect (at 1.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 12f09c5e-b733-4d0a-a388-6b38183600a2))
-  (pad "MP" smd roundrect (at -1.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8b9763b8-18fb-4ecd-8de3-812447e47765))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM02B-SHLS-TF_1x02-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal.kicad_mod
index 4ae1e6f61..9ccc27d8a 100644
--- a/Connector_JST.pretty/JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,47 +1,61 @@
-(footprint "JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM05B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 069e9173-fccd-421f-8410-d118ad07d203)
   )
-  (fp_text value "JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 208dbd7e-e99d-4177-97e5-cd2c84fc4c7c)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -3.9 -1.3) (end 3.9 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.01 0.34) (end -4.01 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.01 -1.41) (end -2.56 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.56 -1.41) (end -2.56 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.01 0.34) (end 4.01 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.01 -1.41) (end 2.56 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.01 2.56) (end -4.01 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.01 3.11) (end 4.01 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.01 3.11) (end 4.01 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.9 3) (end 3.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.9 -1.3) (end -3.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.9 -1.3) (end 3.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 -2.8) (end -4.4 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.4 3.5) (end 4.4 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 3.5) (end 4.4 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 -2.8) (end -4.4 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.5 -1.3) (end -2 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.592893) (end -1.5 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.45 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.45 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9c7565bd-fc63-41ab-90a2-dbda15e96d7b)
   )
-  (fp_line (start 4.01 -1.41) (end 2.56 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 06e22d06-3764-4c81-9577-eda6b2b5dd0a))
-  (fp_line (start -2.56 -1.41) (end -2.56 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 14a36b23-ec19-4571-9505-6d1da8fba233))
-  (fp_line (start -4.01 -1.41) (end -2.56 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 3ce1436e-325c-4ed4-9840-92f5cd1175c7))
-  (fp_line (start 4.01 0.34) (end 4.01 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 41652ca2-289d-4d23-80cc-6a8a7840f44b))
-  (fp_line (start -4.01 0.34) (end -4.01 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 783bdaf3-f677-4571-a063-6310e6d57260))
-  (fp_line (start -4.01 3.11) (end 4.01 3.11) (layer "F.SilkS") (width 0.12) (tstamp 93f291c4-73a2-4a19-a2b1-dc3f7484871b))
-  (fp_line (start 4.01 3.11) (end 4.01 2.56) (layer "F.SilkS") (width 0.12) (tstamp f348e7bc-794c-4806-9fb4-0210b62cae0c))
-  (fp_line (start -4.01 2.56) (end -4.01 3.11) (layer "F.SilkS") (width 0.12) (tstamp f8b19e6e-f442-40fa-b1ac-62c1bb73e1d5))
-  (fp_line (start 4.4 3.5) (end 4.4 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 1db0c7ee-fd9c-4aca-86a9-e80904853e38))
-  (fp_line (start -4.4 -2.8) (end -4.4 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 34107594-c3c8-47f0-a4e5-a4510924f77e))
-  (fp_line (start 4.4 -2.8) (end -4.4 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 99a87f99-45c5-4560-8e3f-877085bb7b94))
-  (fp_line (start -4.4 3.5) (end 4.4 3.5) (layer "F.CrtYd") (width 0.05) (tstamp ada41813-06e8-45ca-8e51-c01e6f120a5a))
-  (fp_line (start -3.9 3) (end 3.9 3) (layer "F.Fab") (width 0.1) (tstamp 175f6d37-24a3-4db7-835f-0effa92aa49d))
-  (fp_line (start -2 -0.592893) (end -1.5 -1.3) (layer "F.Fab") (width 0.1) (tstamp 569789c8-70f4-4de0-9c46-d5c9c830be6b))
-  (fp_line (start 3.9 -1.3) (end 3.9 3) (layer "F.Fab") (width 0.1) (tstamp 825ab4ea-942b-4b42-8f2d-ff93a3d527ef))
-  (fp_line (start -3.9 -1.3) (end -3.9 3) (layer "F.Fab") (width 0.1) (tstamp af270d29-9514-48b1-9c2a-074955b693f9))
-  (fp_line (start -2.5 -1.3) (end -2 -0.592893) (layer "F.Fab") (width 0.1) (tstamp cea33f83-7d57-4f3b-8cf0-ee2261f52c09))
-  (fp_line (start -3.9 -1.3) (end 3.9 -1.3) (layer "F.Fab") (width 0.1) (tstamp d228500e-108a-43ad-9f39-80e25d3a9c96))
-  (pad "1" smd roundrect (at -2 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1decc5c0-27ab-4d07-8d83-558f31339856))
-  (pad "2" smd roundrect (at -1 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a1fc2133-96c8-4e04-a45a-e3d179cf8616))
-  (pad "3" smd roundrect (at 0 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 44cdd5f9-0928-4133-8671-d1e07d04fc4a))
-  (pad "4" smd roundrect (at 1 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 26b00d28-e972-4ae4-aea9-6af105ff8ca9))
-  (pad "5" smd roundrect (at 2 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 87e772b0-f02a-4482-9a71-b33d7400e20e))
-  (pad "MP" smd roundrect (at 3.45 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cb8c6b72-be7a-4d01-a71d-6e97fd2b8ade))
-  (pad "MP" smd roundrect (at -3.45 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb98d0c9-236e-4002-a3a7-bb6ee6f655f0))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM05B-SHLS-TF_1x05-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal.kicad_mod
index 44387fba6..f4afec37d 100644
--- a/Connector_JST.pretty/JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,48 +1,62 @@
-(footprint "JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM06B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b6371d2d-8a1d-49fa-bf19-12f46fd7204f)
   )
-  (fp_text value "JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e9b5bf16-c097-4ae8-b9c6-c43a4db21fdb)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -4.4 -1.3) (end 4.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.51 0.34) (end -4.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.51 -1.41) (end -3.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.06 -1.41) (end -3.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.51 0.34) (end 4.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.51 -1.41) (end 3.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.51 2.56) (end -4.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.51 3.11) (end 4.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.51 3.11) (end 4.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.4 3) (end 4.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 -1.3) (end -4.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.4 -1.3) (end 4.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.9 -2.8) (end -4.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.9 3.5) (end 4.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.9 3.5) (end 4.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.9 -2.8) (end -4.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3 -1.3) (end -2.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.592893) (end -2 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 3.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a4a2d682-85c5-43b9-ab55-67001ee7ceb2)
   )
-  (fp_line (start -4.51 0.34) (end -4.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 19155524-8902-4261-b818-b2a4fc9be2cb))
-  (fp_line (start 4.51 -1.41) (end 3.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 4c26d448-cff0-4633-abfe-237fb11605eb))
-  (fp_line (start -4.51 2.56) (end -4.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 6c82db37-677f-493b-a059-9eb9b0ba0d26))
-  (fp_line (start 4.51 3.11) (end 4.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 6db95bd6-6425-472b-bcb8-35135a2b6cf2))
-  (fp_line (start -3.06 -1.41) (end -3.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp bcc15757-e2c0-4d8c-b0a4-f27e2786404b))
-  (fp_line (start -4.51 3.11) (end 4.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp be079393-16d6-4077-b4d0-388c374f0069))
-  (fp_line (start 4.51 0.34) (end 4.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp ef3d9b2d-d03d-45a9-a9e4-04c11a1e32d8))
-  (fp_line (start -4.51 -1.41) (end -3.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp f0e632c3-3cc7-46e9-8072-024f8dd87629))
-  (fp_line (start -4.9 -2.8) (end -4.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 64a80ac2-c4dd-4451-8e79-93ca267241a7))
-  (fp_line (start 4.9 -2.8) (end -4.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 691a06a4-597a-4381-9b14-e5e0fc580767))
-  (fp_line (start -4.9 3.5) (end 4.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 90c5344b-ef50-4cb6-90c1-0c54903c5ca0))
-  (fp_line (start 4.9 3.5) (end 4.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp ef2536c8-da2a-43ee-a52d-d9150ace8b4c))
-  (fp_line (start -4.4 3) (end 4.4 3) (layer "F.Fab") (width 0.1) (tstamp 10971701-9f82-42e4-9b65-73b7dd4df03b))
-  (fp_line (start -2.5 -0.592893) (end -2 -1.3) (layer "F.Fab") (width 0.1) (tstamp 1f0d3887-446c-4286-be25-bcc29042d26d))
-  (fp_line (start -4.4 -1.3) (end 4.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 243dcd26-766b-4844-9379-855a1b96ed68))
-  (fp_line (start -3 -1.3) (end -2.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 6b59ac61-e7d7-41cf-844b-72f4e01a77a9))
-  (fp_line (start 4.4 -1.3) (end 4.4 3) (layer "F.Fab") (width 0.1) (tstamp a412a486-4721-4374-b10b-220f657f696d))
-  (fp_line (start -4.4 -1.3) (end -4.4 3) (layer "F.Fab") (width 0.1) (tstamp fce10b45-43f6-4e01-8444-e23694621f2a))
-  (pad "1" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0dfb9f72-c8ba-4eae-9584-f6a1e21ba666))
-  (pad "2" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 522885d8-b50e-47b0-99ef-ef7b0db90f2d))
-  (pad "3" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b16eb83c-c8c2-4f5d-9b76-f6993ccfaf22))
-  (pad "4" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97cca156-1a6d-4f16-be16-bc6a202787d0))
-  (pad "5" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99805b4d-d7cf-4582-86a5-c114583ee590))
-  (pad "6" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6a7c01eb-8f98-4a27-a60c-cd33893bec67))
-  (pad "MP" smd roundrect (at 3.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bb4b243f-622a-4463-b9e0-8d4411be53a2))
-  (pad "MP" smd roundrect (at -3.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c2919b6e-3e21-49ac-a741-050e6e1327f1))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM06B-SHLS-TF_1x06-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal.kicad_mod
index 552d424f7..76f14fde2 100644
--- a/Connector_JST.pretty/JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,49 +1,63 @@
-(footprint "JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM07B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 63c57959-9c6c-4193-926e-5109bcd662f2)
   )
-  (fp_text value "JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 63fcd3ca-e6f3-4f45-ba83-a35495e312e1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -4.9 -1.3) (end 4.9 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.01 0.34) (end -5.01 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.01 -1.41) (end -3.56 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.56 -1.41) (end -3.56 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.01 0.34) (end 5.01 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.01 -1.41) (end 3.56 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.01 2.56) (end -5.01 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.01 3.11) (end 5.01 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.01 3.11) (end 5.01 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.9 3) (end 4.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.9 -1.3) (end -4.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.9 -1.3) (end 4.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.4 -2.8) (end -5.4 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.4 3.5) (end 5.4 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.4 3.5) (end 5.4 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.4 -2.8) (end -5.4 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 -1.3) (end -3 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 -0.592893) (end -2.5 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.45 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 4.45 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0226f537-2c7a-45a6-9c14-ac8b0265c3ef)
   )
-  (fp_line (start 5.01 3.11) (end 5.01 2.56) (layer "F.SilkS") (width 0.12) (tstamp 0d00fc4a-9c3f-4418-a2db-70ea4578e0d7))
-  (fp_line (start -3.56 -1.41) (end -3.56 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 4f76cf3b-5f5b-4992-be5f-65aff4a1464b))
-  (fp_line (start 5.01 0.34) (end 5.01 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 77c2c250-b717-457d-8f54-55af894828c3))
-  (fp_line (start -5.01 2.56) (end -5.01 3.11) (layer "F.SilkS") (width 0.12) (tstamp 8d854f16-f259-4a36-afdb-6c282f7b24cd))
-  (fp_line (start 5.01 -1.41) (end 3.56 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 8eecfa84-3ae9-4f84-bbd9-eb5f7dc12786))
-  (fp_line (start -5.01 -1.41) (end -3.56 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 9dad60d2-eb40-4f62-99be-412210a8076b))
-  (fp_line (start -5.01 0.34) (end -5.01 -1.41) (layer "F.SilkS") (width 0.12) (tstamp b1e0f13d-3bf4-471c-b2f1-fa101617ff24))
-  (fp_line (start -5.01 3.11) (end 5.01 3.11) (layer "F.SilkS") (width 0.12) (tstamp ed277171-09f6-40b6-bc42-6184ed6538be))
-  (fp_line (start 5.4 -2.8) (end -5.4 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 6a719d98-6ef7-4e46-b3ad-5216ff5c0965))
-  (fp_line (start 5.4 3.5) (end 5.4 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 76543853-5e3e-47ab-a1b9-1a7b62fc8b1f))
-  (fp_line (start -5.4 -2.8) (end -5.4 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 8b3c003c-682c-4abc-b121-955ea78ce124))
-  (fp_line (start -5.4 3.5) (end 5.4 3.5) (layer "F.CrtYd") (width 0.05) (tstamp d708f831-f34f-413d-8715-5021d78b8408))
-  (fp_line (start -3 -0.592893) (end -2.5 -1.3) (layer "F.Fab") (width 0.1) (tstamp 119d3ecc-3456-4f78-97ec-d44c34408646))
-  (fp_line (start -3.5 -1.3) (end -3 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 317deafc-3dfe-4ccf-9600-45ec0e25d2ac))
-  (fp_line (start 4.9 -1.3) (end 4.9 3) (layer "F.Fab") (width 0.1) (tstamp 34b9cc49-64a9-4c35-9daa-f999527fad09))
-  (fp_line (start -4.9 -1.3) (end 4.9 -1.3) (layer "F.Fab") (width 0.1) (tstamp 4034db37-f633-4ee7-b159-263c4713930b))
-  (fp_line (start -4.9 -1.3) (end -4.9 3) (layer "F.Fab") (width 0.1) (tstamp bd36acb7-743e-49e8-b64c-1e1451e2d16d))
-  (fp_line (start -4.9 3) (end 4.9 3) (layer "F.Fab") (width 0.1) (tstamp dceb491f-5b6f-4208-8cb2-8a2b7f9ae82b))
-  (pad "1" smd roundrect (at -3 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp da00a90a-5851-4eca-b23e-f1e848297637))
-  (pad "2" smd roundrect (at -2 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a06e9377-1e0b-40fb-b5f7-464191795910))
-  (pad "3" smd roundrect (at -1 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9bf432d8-3d38-4696-a5aa-14d9644eb692))
-  (pad "4" smd roundrect (at 0 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a92c98c4-371b-43e8-915d-b5fac942bf79))
-  (pad "5" smd roundrect (at 1 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0c8fd8be-c1c8-4bd6-95e2-c930d45b8587))
-  (pad "6" smd roundrect (at 2 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2c21adf3-badc-4f71-9d2d-66bd3c01169f))
-  (pad "7" smd roundrect (at 3 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f4977e0a-b2f2-4508-8535-5950c10b8b2a))
-  (pad "MP" smd roundrect (at 4.45 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 28076f69-d188-4563-95e4-16b625961d35))
-  (pad "MP" smd roundrect (at -4.45 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 59c2ea3a-9f0d-43db-8d9f-109c256e1879))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM07B-SHLS-TF_1x07-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal.kicad_mod
index c37332c24..d5bf00f0c 100644
--- a/Connector_JST.pretty/JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,50 +1,64 @@
-(footprint "JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM08B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 935c41ba-5e34-403f-aac3-aa31cb2f226c)
   )
-  (fp_text value "JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6205fffe-bd6d-4fd6-a521-139bf58f3ec1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -5.4 -1.3) (end 5.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.51 0.34) (end -5.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.51 -1.41) (end -4.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.06 -1.41) (end -4.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.51 0.34) (end 5.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.51 -1.41) (end 4.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.51 2.56) (end -5.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.51 3.11) (end 5.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.51 3.11) (end 5.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.4 3) (end 5.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.4 -1.3) (end -5.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.4 -1.3) (end 5.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.9 -2.8) (end -5.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.9 3.5) (end 5.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.9 3.5) (end 5.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.9 -2.8) (end -5.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4 -1.3) (end -3.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.592893) (end -3 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 4.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2d11075f-3b16-419b-88e3-fdcdf3f3881f)
   )
-  (fp_line (start -5.51 2.56) (end -5.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 1e1a6264-a71e-48e2-9b4f-fa033292cd19))
-  (fp_line (start -5.51 0.34) (end -5.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 5a7de449-f49d-46b9-8fa4-935415585e6a))
-  (fp_line (start -5.51 -1.41) (end -4.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 5daf37ca-fa52-4e7f-8417-1fbd35b71310))
-  (fp_line (start 5.51 3.11) (end 5.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp aa01d1b5-ef45-4012-bbaa-d9769d1e040a))
-  (fp_line (start -4.06 -1.41) (end -4.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp abae11f0-8dc9-44f2-8cba-318e96718682))
-  (fp_line (start 5.51 -1.41) (end 4.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp b0e6829b-049e-4e28-a72c-c93db3d83256))
-  (fp_line (start 5.51 0.34) (end 5.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp cb4cd68f-c6df-40fc-bf1d-1b858cb12562))
-  (fp_line (start -5.51 3.11) (end 5.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp da1bc791-5a86-4331-8497-278ac0fbe105))
-  (fp_line (start -5.9 -2.8) (end -5.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 29d1a6ef-0bc9-418d-b474-43d42963f45b))
-  (fp_line (start -5.9 3.5) (end 5.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 6ffb7eac-2aac-4702-a4e6-c17360b4451a))
-  (fp_line (start 5.9 -2.8) (end -5.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp a504ed18-9266-41a1-b2fb-eaf3e280420a))
-  (fp_line (start 5.9 3.5) (end 5.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp cf6fce56-ab2b-4c98-849f-c3bfb6d185ec))
-  (fp_line (start -3.5 -0.592893) (end -3 -1.3) (layer "F.Fab") (width 0.1) (tstamp 2a6d60bd-8061-49c3-9e10-dda7cb80ac31))
-  (fp_line (start -5.4 -1.3) (end 5.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 5579252d-5fe0-4c16-9cf5-eb1a33f66d47))
-  (fp_line (start -5.4 -1.3) (end -5.4 3) (layer "F.Fab") (width 0.1) (tstamp 6b044b65-712b-42fc-b71f-77505d374de5))
-  (fp_line (start -4 -1.3) (end -3.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp bb6340a7-7cea-42b4-a2c5-2d1053e92bd8))
-  (fp_line (start 5.4 -1.3) (end 5.4 3) (layer "F.Fab") (width 0.1) (tstamp d485eb08-8f15-4890-a769-8aaba22fdc43))
-  (fp_line (start -5.4 3) (end 5.4 3) (layer "F.Fab") (width 0.1) (tstamp e78a572f-e4fd-40b5-a038-c07adb7366fa))
-  (pad "1" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 722ef421-2ede-4073-a9aa-06f774f8a0e7))
-  (pad "2" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d72b438e-5661-47a5-9158-b5a6789c5ce2))
-  (pad "3" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ca162caa-981c-4455-abb8-fd28a26591d6))
-  (pad "4" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f0e0f9d0-62db-454d-82b0-3ee2e9112438))
-  (pad "5" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d3cf7183-34d2-42d1-9224-d845c18a651a))
-  (pad "6" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc27fcb6-fdb1-4fd3-86eb-ac4f78ea760a))
-  (pad "7" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ce49a2cd-b7df-48f6-ba73-b9d957b1e5b8))
-  (pad "8" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3c77369e-6e3b-4206-9b72-e59206ce7529))
-  (pad "MP" smd roundrect (at -4.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0141df19-8a04-427d-8871-15fd40c5db08))
-  (pad "MP" smd roundrect (at 4.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e684ad0f-e7b0-4541-9b03-46b755ce36b2))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM08B-SHLS-TF_1x08-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal.kicad_mod
index d301eeb70..6f18599f1 100644
--- a/Connector_JST.pretty/JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,52 +1,66 @@
-(footprint "JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM10B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 03161548-bbee-4dd8-a6d3-e26a9bb9d13a)
   )
-  (fp_text value "JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 96568c22-c3f0-4da5-b363-d8540542c5b1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -6.4 -1.3) (end 6.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.51 0.34) (end -6.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.51 -1.41) (end -5.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.06 -1.41) (end -5.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.51 0.34) (end 6.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.51 -1.41) (end 5.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.51 2.56) (end -6.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.51 3.11) (end 6.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.51 3.11) (end 6.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.4 3) (end 6.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.4 -1.3) (end -6.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.4 -1.3) (end 6.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.9 -2.8) (end -6.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.9 3.5) (end 6.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.9 3.5) (end 6.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.9 -2.8) (end -6.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5 -1.3) (end -4.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 -0.592893) (end -4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 5.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a5768323-a801-4f32-81c4-32813dd21d56)
   )
-  (fp_line (start -6.51 2.56) (end -6.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 0cfe7aef-8b85-4772-a53e-e99f5489b962))
-  (fp_line (start 6.51 -1.41) (end 5.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 2de4794d-6681-4f2d-8b0e-c19788d6f620))
-  (fp_line (start 6.51 3.11) (end 6.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 593401ff-2712-4943-a611-cda6759ac4f3))
-  (fp_line (start 6.51 0.34) (end 6.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 5fc533c0-ca93-4441-9bc7-ed3e797bf84e))
-  (fp_line (start -5.06 -1.41) (end -5.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 82e5525a-6640-4b17-81b4-6ff08494a406))
-  (fp_line (start -6.51 -1.41) (end -5.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 8b38c353-0725-4543-bf5e-acb0e6ceabd7))
-  (fp_line (start -6.51 3.11) (end 6.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp d14dd46a-8b7d-49a7-85cc-ff6782bd57df))
-  (fp_line (start -6.51 0.34) (end -6.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp f2142321-fcf5-4a46-af47-8b5363ff98c1))
-  (fp_line (start 6.9 -2.8) (end -6.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 4a7436a3-5dfe-4719-8620-9a6437701c6d))
-  (fp_line (start -6.9 3.5) (end 6.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 68af7282-12fb-4014-b292-8a2a8ec6ad70))
-  (fp_line (start -6.9 -2.8) (end -6.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 6c09e3f8-4880-4320-9e8d-f4940d962534))
-  (fp_line (start 6.9 3.5) (end 6.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 7e6e3e68-3e92-4e96-9cde-0c69b345d17b))
-  (fp_line (start -4.5 -0.592893) (end -4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 11c8d703-4a77-46cf-9494-2226c500d113))
-  (fp_line (start -6.4 3) (end 6.4 3) (layer "F.Fab") (width 0.1) (tstamp 5a1048a3-362d-4d75-a3d0-6b5cd44ecac2))
-  (fp_line (start -6.4 -1.3) (end 6.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 6942346f-3a30-414a-94da-ad9109c5571b))
-  (fp_line (start 6.4 -1.3) (end 6.4 3) (layer "F.Fab") (width 0.1) (tstamp 6b4a904d-7b00-4787-8fa5-578e858671db))
-  (fp_line (start -5 -1.3) (end -4.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp c526391c-c3fa-4028-8350-37852f2ab56e))
-  (fp_line (start -6.4 -1.3) (end -6.4 3) (layer "F.Fab") (width 0.1) (tstamp e1109be3-7b0c-405f-a49c-37376f160bd5))
-  (pad "1" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f16024ac-3be7-4945-aef7-bffa0c7aebad))
-  (pad "2" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 27697db0-dde4-4d3e-a1da-b7741022a611))
-  (pad "3" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d3159ca-9413-47a8-954e-cfad1c5ca963))
-  (pad "4" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1d23412d-3d5a-4ce6-ad6a-da4da49b667b))
-  (pad "5" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5b9b62f-4903-43f5-9516-30ea69dbe9d4))
-  (pad "6" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 31b7e29d-13db-4664-b8f8-25599f1df1b6))
-  (pad "7" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 92401d42-c6ce-4a6a-9ca7-93fc7092a794))
-  (pad "8" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 52b66623-8074-4919-afb9-832dcf8bd540))
-  (pad "9" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a66d38f7-65a8-4e63-858b-b0f3251bfc46))
-  (pad "10" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 34511640-c053-46e8-951c-eae64702af96))
-  (pad "MP" smd roundrect (at 5.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4bffbd61-c845-46e8-9255-073d1f970ce4))
-  (pad "MP" smd roundrect (at -5.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 62723f06-b8ed-4b5f-9be0-8e7968f3ff23))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM10B-SHLS-TF_1x10-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal.kicad_mod
index 6b5ef548a..391098d3e 100644
--- a/Connector_JST.pretty/JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,53 +1,67 @@
-(footprint "JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM11B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4bec2e0b-e920-4f25-95af-46e07c2672e1)
   )
-  (fp_text value "JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 664c9ade-496b-4dbe-99d4-382685641a9a)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -6.9 -1.3) (end 6.9 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.01 0.34) (end -7.01 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.01 -1.41) (end -5.56 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.56 -1.41) (end -5.56 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.01 0.34) (end 7.01 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.01 -1.41) (end 5.56 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.01 2.56) (end -7.01 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.01 3.11) (end 7.01 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.01 3.11) (end 7.01 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.9 3) (end 6.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.9 -1.3) (end -6.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.9 -1.3) (end 6.9 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.4 -2.8) (end -7.4 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.4 3.5) (end 7.4 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.4 3.5) (end 7.4 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.4 -2.8) (end -7.4 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 -1.3) (end -5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.592893) (end -4.5 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.45 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 6.45 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1e674efe-27ed-4683-aade-5c8fa37e58be)
   )
-  (fp_line (start -7.01 2.56) (end -7.01 3.11) (layer "F.SilkS") (width 0.12) (tstamp 368431df-e516-4eef-9acf-9da3a20122fb))
-  (fp_line (start 7.01 -1.41) (end 5.56 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 45ae33f5-b777-46d2-a302-ec8f50381698))
-  (fp_line (start -5.56 -1.41) (end -5.56 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 5734f0dd-cffc-4aa8-a32d-e4cbbfae57c5))
-  (fp_line (start -7.01 0.34) (end -7.01 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 98d84c58-90d9-4207-a90b-46b9e331965c))
-  (fp_line (start 7.01 0.34) (end 7.01 -1.41) (layer "F.SilkS") (width 0.12) (tstamp b5462d0f-034a-4513-8e57-a6c792d67497))
-  (fp_line (start -7.01 3.11) (end 7.01 3.11) (layer "F.SilkS") (width 0.12) (tstamp cb84dade-673f-40f8-b5d2-b12b1d1fc3d5))
-  (fp_line (start -7.01 -1.41) (end -5.56 -1.41) (layer "F.SilkS") (width 0.12) (tstamp d4473389-910e-4617-8d56-c071af9c01cf))
-  (fp_line (start 7.01 3.11) (end 7.01 2.56) (layer "F.SilkS") (width 0.12) (tstamp f31a456b-6b7f-4955-806b-62067e283486))
-  (fp_line (start -7.4 3.5) (end 7.4 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 29f25b1d-512f-4307-93ca-8a6c7b537ac1))
-  (fp_line (start -7.4 -2.8) (end -7.4 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 5d71fc6a-cb83-48b8-8c36-48ba93f76ea3))
-  (fp_line (start 7.4 -2.8) (end -7.4 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp a1037832-cf3c-4c89-975f-a225a56ee071))
-  (fp_line (start 7.4 3.5) (end 7.4 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp d0d3d3e0-e204-434c-8425-d6bc32a7e422))
-  (fp_line (start -5 -0.592893) (end -4.5 -1.3) (layer "F.Fab") (width 0.1) (tstamp 049c345f-e50b-4cca-b593-fc5aa1e7c991))
-  (fp_line (start -5.5 -1.3) (end -5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 19e138f2-85d7-44a7-8e3c-b3197a864939))
-  (fp_line (start -6.9 3) (end 6.9 3) (layer "F.Fab") (width 0.1) (tstamp 8ec0a4d5-73fc-4483-8f4f-d466df9a877a))
-  (fp_line (start 6.9 -1.3) (end 6.9 3) (layer "F.Fab") (width 0.1) (tstamp a52d1157-acc0-4dfe-9e91-6d0f1edc83a3))
-  (fp_line (start -6.9 -1.3) (end -6.9 3) (layer "F.Fab") (width 0.1) (tstamp bf383cb8-8031-4dff-8176-7cd692fad7fe))
-  (fp_line (start -6.9 -1.3) (end 6.9 -1.3) (layer "F.Fab") (width 0.1) (tstamp ca24c7e5-823e-4341-95a4-c658387f4c87))
-  (pad "1" smd roundrect (at -5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9f861cef-acfa-4209-940c-d7200661be8f))
-  (pad "2" smd roundrect (at -4 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fadcafb5-9d27-4c59-9c7c-73bdb5f2295d))
-  (pad "3" smd roundrect (at -3 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7c36330b-4d61-4803-8d16-acede246a534))
-  (pad "4" smd roundrect (at -2 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3a7621f2-a5cb-4b5d-acab-b98228f744ce))
-  (pad "5" smd roundrect (at -1 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 841e80f0-0939-40bd-bf91-bd373671dbcc))
-  (pad "6" smd roundrect (at 0 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 663c24b1-3150-4bdd-95ce-724ab9c9801a))
-  (pad "7" smd roundrect (at 1 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3c0a29a7-c7ca-442d-ba7e-af1d0ff851b0))
-  (pad "8" smd roundrect (at 2 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a0f4ab70-fe59-4095-a035-04da5102d7e9))
-  (pad "9" smd roundrect (at 3 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e60aee98-a065-4fe4-8fef-f6acb3813b59))
-  (pad "10" smd roundrect (at 4 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp db48837c-c8d2-461a-a8df-6e5c716d80d6))
-  (pad "11" smd roundrect (at 5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fa661abe-88cd-4d77-bc58-1839a51f8d20))
-  (pad "MP" smd roundrect (at -6.45 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1c5d7592-e1fc-4d44-986b-2a41e73b29b2))
-  (pad "MP" smd roundrect (at 6.45 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 800d4cf9-c482-4262-85eb-5b626d614466))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM11B-SHLS-TF_1x11-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal.kicad_mod
index a58547abb..e6767569a 100644
--- a/Connector_JST.pretty/JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,54 +1,68 @@
-(footprint "JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM12B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2d52e5a0-b864-4587-96c9-f1d6e38d2e38)
   )
-  (fp_text value "JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5171051a-dbc7-4026-ae0f-935fceecab6e)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -7.4 -1.3) (end 7.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.51 0.34) (end -7.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.51 -1.41) (end -6.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.06 -1.41) (end -6.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.51 0.34) (end 7.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.51 -1.41) (end 6.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.51 2.56) (end -7.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.51 3.11) (end 7.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.51 3.11) (end 7.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.4 3) (end 7.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.4 -1.3) (end -7.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.4 -1.3) (end 7.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.9 -2.8) (end -7.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.9 3.5) (end 7.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.9 3.5) (end 7.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.9 -2.8) (end -7.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6 -1.3) (end -5.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -0.592893) (end -5 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 6.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 91211432-e6ef-4143-9b21-655ca572fb66)
   )
-  (fp_line (start -7.51 3.11) (end 7.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 12546718-e0ca-4ac1-a246-7d9a062d231a))
-  (fp_line (start -7.51 0.34) (end -7.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 709c68a6-0b8a-4a86-a14b-2f489772b6ac))
-  (fp_line (start 7.51 3.11) (end 7.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 73499844-bf41-4ab1-9fba-98a54ee77f59))
-  (fp_line (start -7.51 2.56) (end -7.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp a44698b5-712f-4a38-b38f-66885a1b134d))
-  (fp_line (start -6.06 -1.41) (end -6.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp b3d54f29-a248-4189-8fb9-e7be4b618617))
-  (fp_line (start 7.51 0.34) (end 7.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp b7056504-b021-4fac-b750-8e895cf8b540))
-  (fp_line (start 7.51 -1.41) (end 6.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp c7226edd-8a9d-4c10-8546-b23ec908000d))
-  (fp_line (start -7.51 -1.41) (end -6.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp f357edd9-040c-4c8f-9794-e5e42c330ca0))
-  (fp_line (start 7.9 -2.8) (end -7.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 086b21ed-33b7-4c98-b977-9a22c1913afd))
-  (fp_line (start -7.9 -2.8) (end -7.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 5fcca2f3-a700-4414-baa7-1af966cf4e31))
-  (fp_line (start 7.9 3.5) (end 7.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 836860e1-81b3-4932-9fa8-71cc2f96fada))
-  (fp_line (start -7.9 3.5) (end 7.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 8536c08e-42b0-48de-85c3-78aba8d20f60))
-  (fp_line (start -6 -1.3) (end -5.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 01239ad7-382d-4381-83e7-b0e099e421e1))
-  (fp_line (start -5.5 -0.592893) (end -5 -1.3) (layer "F.Fab") (width 0.1) (tstamp 0580b040-8948-487c-8d71-48ff47ec81d7))
-  (fp_line (start -7.4 -1.3) (end -7.4 3) (layer "F.Fab") (width 0.1) (tstamp 12453d78-f288-4964-a5ee-79c194584446))
-  (fp_line (start 7.4 -1.3) (end 7.4 3) (layer "F.Fab") (width 0.1) (tstamp 72331e5d-54fa-46aa-b888-45c46a387169))
-  (fp_line (start -7.4 -1.3) (end 7.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 7d71dc72-05e4-4955-ad5c-03041ad97800))
-  (fp_line (start -7.4 3) (end 7.4 3) (layer "F.Fab") (width 0.1) (tstamp c61fdbe3-a65a-49d1-b528-ef2c97479ed4))
-  (pad "1" smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 83c91377-4957-4299-a8be-9c74ac92cfe6))
-  (pad "2" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b0932766-d48e-4b77-8477-0eaae4f92c4e))
-  (pad "3" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d6d73ac9-9017-45ec-be10-8e8a93aa99e7))
-  (pad "4" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6faa048f-61e9-42bc-bd6c-e697bc345d08))
-  (pad "5" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1bd21ea0-e116-490f-8790-a6b583192b42))
-  (pad "6" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c05a7ab-e4f1-41a7-adf8-642d1f22a22c))
-  (pad "7" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5e45fee9-5d68-4d47-a512-0f957b21d6f1))
-  (pad "8" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 86104250-d472-4af1-afea-2e536ca8f7e6))
-  (pad "9" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 325b1674-278d-444e-b64f-67a15789e8a8))
-  (pad "10" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b6adae3f-1ec4-488e-ad16-8cb6d9763986))
-  (pad "11" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ab679328-9123-47d2-b27e-598cdea5ca29))
-  (pad "12" smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4e454331-6dc4-4397-8911-aee2b0793ad6))
-  (pad "MP" smd roundrect (at -6.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 381ba5de-c95e-4685-a86d-4d4854db73f4))
-  (pad "MP" smd roundrect (at 6.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 72f397b7-3d9a-43b6-ab9d-e3820397147a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM12B-SHLS-TF_1x12-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal.kicad_mod
index 09d6ff23e..0ca09115d 100644
--- a/Connector_JST.pretty/JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,56 +1,70 @@
-(footprint "JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM14B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3ab095a6-ee7f-4f7d-bce9-64d6c3720054)
   )
-  (fp_text value "JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c3c2ad31-6ebf-4956-b536-067890cfc1ce)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -8.4 -1.3) (end 8.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.51 0.34) (end -8.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.51 -1.41) (end -7.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.06 -1.41) (end -7.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.51 0.34) (end 8.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.51 -1.41) (end 7.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.51 2.56) (end -8.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.51 3.11) (end 8.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.51 3.11) (end 8.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.4 3) (end 8.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.4 -1.3) (end -8.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.4 -1.3) (end 8.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.9 -2.8) (end -8.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.9 3.5) (end 8.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.9 3.5) (end 8.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.9 -2.8) (end -8.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7 -1.3) (end -6.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.592893) (end -6 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 7.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c86ded21-618e-4ca5-b6a1-4da8ee16a52d)
   )
-  (fp_line (start -8.51 -1.41) (end -7.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 07a61ff7-3db9-4a21-be58-da51be1dc88b))
-  (fp_line (start -8.51 2.56) (end -8.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 1021bc28-66e7-48b0-8b51-9a3ff9b8a567))
-  (fp_line (start 8.51 3.11) (end 8.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 28ae7730-0d1b-4f09-a421-62a0b41d7554))
-  (fp_line (start -8.51 3.11) (end 8.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 32be1cbe-65be-44fb-b625-f24f0f66fb00))
-  (fp_line (start 8.51 -1.41) (end 7.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 3ae888dd-3e8b-4f45-84dc-b18451814705))
-  (fp_line (start 8.51 0.34) (end 8.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 520c7e99-4a70-45a8-99a6-1746dfca9ff3))
-  (fp_line (start -7.06 -1.41) (end -7.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 611106a5-c54b-44cc-bfe8-0e251bef60b6))
-  (fp_line (start -8.51 0.34) (end -8.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp b4b73f66-c185-4ba6-8338-ea7e0636d30c))
-  (fp_line (start -8.9 3.5) (end 8.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 1ed75a82-ccdb-4cd4-aaea-e94e0f93f169))
-  (fp_line (start 8.9 3.5) (end 8.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 3efc2547-f072-45f0-b5b7-78591ff81a3e))
-  (fp_line (start -8.9 -2.8) (end -8.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 8015d4c5-f445-4dc4-8989-2b820dafb5ca))
-  (fp_line (start 8.9 -2.8) (end -8.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 99acf693-c9fc-4a27-aaaa-6435b6b5d009))
-  (fp_line (start -8.4 3) (end 8.4 3) (layer "F.Fab") (width 0.1) (tstamp 04a086bc-7874-4a27-a04c-92eac9419f3c))
-  (fp_line (start -8.4 -1.3) (end 8.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 1837ad54-c1d1-455c-922a-f42fd411f9c3))
-  (fp_line (start 8.4 -1.3) (end 8.4 3) (layer "F.Fab") (width 0.1) (tstamp 378196de-f24f-416b-a93d-4a45b55fcad0))
-  (fp_line (start -6.5 -0.592893) (end -6 -1.3) (layer "F.Fab") (width 0.1) (tstamp 71af457a-959d-4587-944f-804fb5236d15))
-  (fp_line (start -7 -1.3) (end -6.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 8204a612-9451-4900-a69d-5269c7f75624))
-  (fp_line (start -8.4 -1.3) (end -8.4 3) (layer "F.Fab") (width 0.1) (tstamp 9928abc0-856a-469c-b0c1-219dbc28019d))
-  (pad "1" smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ea599949-0a8d-49b7-bfcd-200a613c204a))
-  (pad "2" smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6195234d-4024-4a79-9086-c4de181e7609))
-  (pad "3" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 410f7e6b-b376-450b-859b-4bbdb199bfcd))
-  (pad "4" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2feb83d2-70e1-4623-bf86-e615a1d75de6))
-  (pad "5" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ef05c6fb-7328-435c-97ab-669476432952))
-  (pad "6" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 18dc42e3-c359-4e52-8960-a0b0931c47ee))
-  (pad "7" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00d5e6f3-899e-4964-87a0-9a65c9942a55))
-  (pad "8" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ece31137-9c0f-4166-9bce-aaac09e7457b))
-  (pad "9" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f6cc3271-9b97-4336-bb4a-ed89d0de8f85))
-  (pad "10" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f88c4a5-fa0f-4ba8-b8cf-d152a2b71b71))
-  (pad "11" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 441f4af6-57a7-43c1-bfe4-799150e2c39f))
-  (pad "12" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 76a89ef8-72a0-451a-b946-a9b4f2bfbbd8))
-  (pad "13" smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fc3650bb-bd65-4e48-b63b-8fd64e7e253c))
-  (pad "14" smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 252e0063-4d41-4f9b-a75c-304bff309b75))
-  (pad "MP" smd roundrect (at 7.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c1311df9-d06c-47a8-9ac8-a9fc117fa548))
-  (pad "MP" smd roundrect (at -7.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp df4197d7-90a4-4407-b49b-c14d13f67695))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM14B-SHLS-TF_1x14-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal.kicad_mod
index 6c9d32d27..9649a473b 100644
--- a/Connector_JST.pretty/JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,58 +1,72 @@
-(footprint "JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM16B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7767c1ec-89af-4082-8a6c-f988de59822e)
   )
-  (fp_text value "JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4a944c45-7864-4f5c-be48-16ea426dbc7c)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -9.4 -1.3) (end 9.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.51 0.34) (end -9.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.51 -1.41) (end -8.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.06 -1.41) (end -8.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.51 0.34) (end 9.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.51 -1.41) (end 8.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.51 2.56) (end -9.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.51 3.11) (end 9.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.51 3.11) (end 9.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.4 3) (end 9.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.4 -1.3) (end -9.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.4 -1.3) (end 9.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.9 -2.8) (end -9.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.9 3.5) (end 9.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.9 3.5) (end 9.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.9 -2.8) (end -9.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8 -1.3) (end -7.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 -0.592893) (end -7 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 8.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b841cf38-cb70-41cd-989f-5aeace098102)
   )
-  (fp_line (start -8.06 -1.41) (end -8.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 07845065-1536-45ab-a573-11189e0e6741))
-  (fp_line (start -9.51 0.34) (end -9.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 16d27fba-520f-48fb-ab35-ec0eae595034))
-  (fp_line (start 9.51 -1.41) (end 8.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 3c2d0361-c3fa-4e04-aa21-144a6ad96a01))
-  (fp_line (start -9.51 -1.41) (end -8.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp a8000b48-b565-4e9d-8147-593e818bf122))
-  (fp_line (start 9.51 0.34) (end 9.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp be593ea4-7881-4b49-97fd-c49d0f2a1b3a))
-  (fp_line (start 9.51 3.11) (end 9.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp cdff36b3-d635-486f-b0e5-88f85e076e42))
-  (fp_line (start -9.51 3.11) (end 9.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp f0a9f909-eedf-49ad-ac27-46ba401575c4))
-  (fp_line (start -9.51 2.56) (end -9.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp f5d40d1f-5119-490f-846e-c623c3fec379))
-  (fp_line (start -9.9 3.5) (end 9.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 3fe33161-d047-4947-ada3-3fa58b21ef91))
-  (fp_line (start -9.9 -2.8) (end -9.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 451d9562-e0b8-44c0-bd92-cae135fc5507))
-  (fp_line (start 9.9 3.5) (end 9.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 8e633d16-911a-4db5-9163-efcfe6f5bf3d))
-  (fp_line (start 9.9 -2.8) (end -9.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp c57eebc5-ded4-4a77-a99e-e1b53ddeea4b))
-  (fp_line (start 9.4 -1.3) (end 9.4 3) (layer "F.Fab") (width 0.1) (tstamp 289e1513-5bba-4707-8c35-55f3e87c1caf))
-  (fp_line (start -9.4 3) (end 9.4 3) (layer "F.Fab") (width 0.1) (tstamp b0e0a17a-8d2a-42fc-a2a1-0beca917e7c0))
-  (fp_line (start -9.4 -1.3) (end -9.4 3) (layer "F.Fab") (width 0.1) (tstamp d3f6f612-b31b-476a-bca7-effa6b718286))
-  (fp_line (start -7.5 -0.592893) (end -7 -1.3) (layer "F.Fab") (width 0.1) (tstamp ebd8d974-22ba-4278-9dbb-dc6f436192a5))
-  (fp_line (start -9.4 -1.3) (end 9.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp f5f1e897-f78e-47cd-98ad-5f85c69e7a39))
-  (fp_line (start -8 -1.3) (end -7.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp f6523e95-f4bc-437a-b690-27986419a30f))
-  (pad "1" smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 98ce4223-37b5-4184-9718-acf219d433e2))
-  (pad "2" smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c7a85683-6e2e-4063-8a59-f0dd8f08647f))
-  (pad "3" smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ba48a0fc-f71c-4533-8b71-052430ea089b))
-  (pad "4" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aa5c0b40-966d-40be-9d36-b1225181b8f7))
-  (pad "5" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5a011dd0-82f1-419a-88bd-13248d74ecc7))
-  (pad "6" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0db34ae4-88e8-4859-8ec5-9f7fdd96a9b7))
-  (pad "7" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2e943d07-b9d1-4e80-9d19-a1ae0778384a))
-  (pad "8" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 94677958-81a6-4791-af53-908c94d4ff84))
-  (pad "9" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99680c2c-975b-453f-af6f-44cd1b2f9c88))
-  (pad "10" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4bf8410d-028c-4c9a-ac05-0327ae106ec5))
-  (pad "11" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc358b65-79d9-4378-9f77-44f2a42d1125))
-  (pad "12" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f645581b-71cd-4b04-a3f6-581ac8676cdf))
-  (pad "13" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7ad702c5-eca5-4974-ac6d-b9ebe54e406b))
-  (pad "14" smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 54ac578f-fb18-4020-88c5-e354d1fca265))
-  (pad "15" smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 71bc9d92-4014-4bf5-9e58-6d9761a33e61))
-  (pad "16" smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99106635-f175-4982-8337-c2282fc5d803))
-  (pad "MP" smd roundrect (at 8.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b1ca77b9-0f03-4238-9d69-27e23a64459d))
-  (pad "MP" smd roundrect (at -8.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eab794db-d6c7-4e27-8c24-d5c526e703a1))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM16B-SHLS-TF_1x16-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal.kicad_mod
index 1c9bdbc6f..dbe9fec79 100644
--- a/Connector_JST.pretty/JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,62 +1,76 @@
-(footprint "JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM20B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8e274c88-eb21-47ed-8045-1bba47e71645)
   )
-  (fp_text value "JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0ef998f2-ee90-4e40-a998-f39abc73e75a)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -11.4 -1.3) (end 11.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.51 0.34) (end -11.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.51 -1.41) (end -10.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.06 -1.41) (end -10.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.51 0.34) (end 11.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.51 -1.41) (end 10.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.51 2.56) (end -11.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.51 3.11) (end 11.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.51 3.11) (end 11.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.4 3) (end 11.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.4 -1.3) (end -11.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.4 -1.3) (end 11.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.9 -2.8) (end -11.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.9 3.5) (end 11.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.9 3.5) (end 11.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.9 -2.8) (end -11.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10 -1.3) (end -9.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.5 -0.592893) (end -9 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 10.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp fc0bdb9a-f935-4331-81ea-e5957984569c)
   )
-  (fp_line (start -11.51 3.11) (end 11.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 40a4a80d-9d2d-4348-b8b7-14fa50787713))
-  (fp_line (start 11.51 3.11) (end 11.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 6028db16-481a-417c-bd46-83c1bb5f51c6))
-  (fp_line (start -11.51 2.56) (end -11.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 7d541056-b2f7-4956-b577-fa882e057daf))
-  (fp_line (start -10.06 -1.41) (end -10.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 825ccfa4-c1b9-4417-9aaa-e3490657df21))
-  (fp_line (start 11.51 -1.41) (end 10.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 839e7da3-15dc-492d-80f8-389417580768))
-  (fp_line (start -11.51 -1.41) (end -10.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 84b54073-c388-4985-bff2-a4a6ddaa1719))
-  (fp_line (start 11.51 0.34) (end 11.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp e3c9bb8f-03cd-4a4a-ba8f-c504c84a2ca0))
-  (fp_line (start -11.51 0.34) (end -11.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp f600e720-5c2f-4664-a0e2-57e8b14c886f))
-  (fp_line (start -11.9 -2.8) (end -11.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 5e5fdd1d-bd47-4d9e-9113-b31c29da5158))
-  (fp_line (start 11.9 -2.8) (end -11.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp ab95d449-268e-4dc0-800e-bb938375624a))
-  (fp_line (start -11.9 3.5) (end 11.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp bfd3fd3f-e707-4414-826d-b6165e2d8c66))
-  (fp_line (start 11.9 3.5) (end 11.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp e244f52e-f68c-4625-8cc2-f8e3e412ee15))
-  (fp_line (start 11.4 -1.3) (end 11.4 3) (layer "F.Fab") (width 0.1) (tstamp 12f64d81-5a7b-4a29-8e13-d2b32a72ea9f))
-  (fp_line (start -11.4 -1.3) (end 11.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 36a9e50a-8543-4d53-b545-9db93be67a99))
-  (fp_line (start -11.4 3) (end 11.4 3) (layer "F.Fab") (width 0.1) (tstamp 3bf9915a-fc23-4de6-b72b-a24ebaf2c3df))
-  (fp_line (start -10 -1.3) (end -9.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 4b87f25d-1afa-40cb-93f9-df8aa4bf7af9))
-  (fp_line (start -9.5 -0.592893) (end -9 -1.3) (layer "F.Fab") (width 0.1) (tstamp 4de87134-510f-4887-b851-a6a9f3fa9bf3))
-  (fp_line (start -11.4 -1.3) (end -11.4 3) (layer "F.Fab") (width 0.1) (tstamp fe40497a-76df-48d8-a25e-37fab57d68ce))
-  (pad "1" smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 05e8a3bb-7e29-4292-9541-dc1d0d886e58))
-  (pad "2" smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7b44986d-3aff-4bb0-90b0-b47331ecd007))
-  (pad "3" smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9f127613-c08b-4b7a-aa85-b9515a482361))
-  (pad "4" smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b2df0e2a-1ee0-4da7-b78f-71e682c8dd02))
-  (pad "5" smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f8b1a20b-e8c2-4a68-be5c-d8687d2abd85))
-  (pad "6" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c6247db6-4ed7-4a86-914e-9b251f384520))
-  (pad "7" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4dd780f5-1bc0-49da-96b3-3abc4802dae3))
-  (pad "8" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eab18c53-e344-421b-8685-4d105f4d6f54))
-  (pad "9" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 15ead974-4666-40ae-9148-88b4ed1d8844))
-  (pad "10" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fe0be93a-ca26-4059-a290-4a9f0303f416))
-  (pad "11" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0a4f7d1f-95e3-44cd-9521-edabef8ba9fb))
-  (pad "12" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f9b3344c-d6c5-4971-b101-1500f74275e2))
-  (pad "13" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5e5815ae-29eb-42d2-a756-5ac6d5bd37a8))
-  (pad "14" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6d08504d-6d9a-4f0b-9ada-bcfd699a5611))
-  (pad "15" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7e86469d-1bad-4148-985a-0a7ec1162f30))
-  (pad "16" smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d04c5973-8eda-4165-9969-4f16987837e3))
-  (pad "17" smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 93be2c93-8950-4154-ba17-1eb13dcf49ca))
-  (pad "18" smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 93aaf36e-affc-460a-8af9-267c6961284d))
-  (pad "19" smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e8999a28-1851-462c-add5-4ed960917046))
-  (pad "20" smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 958be2b9-b711-4d8d-a883-5330f59b64a6))
-  (pad "MP" smd roundrect (at -10.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 94815da4-64a3-475c-88aa-9b70a1e8a825))
-  (pad "MP" smd roundrect (at 10.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dd8c9dbd-c439-4c08-802c-57839f8fcdd4))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM20B-SHLS-TF_1x20-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal.kicad_mod
index db718543c..e958f0bc2 100644
--- a/Connector_JST.pretty/JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,64 +1,78 @@
-(footprint "JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM22B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9e9e3a9e-316c-4021-8422-b75bd9b3d908)
   )
-  (fp_text value "JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7acf6580-7be6-47a9-9209-4b8de0e22878)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -12.4 -1.3) (end 12.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.51 0.34) (end -12.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.51 -1.41) (end -11.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.06 -1.41) (end -11.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.51 0.34) (end 12.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.51 -1.41) (end 11.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.51 2.56) (end -12.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.51 3.11) (end 12.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.51 3.11) (end 12.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.4 3) (end 12.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.4 -1.3) (end -12.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.4 -1.3) (end 12.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.9 -2.8) (end -12.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12.9 3.5) (end 12.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.9 3.5) (end 12.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.9 -2.8) (end -12.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11 -1.3) (end -10.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.5 -0.592893) (end -10 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -10.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 21 smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 22 smd roundrect (at 10.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -11.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 11.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e455436f-d3cb-43db-909d-24928f4219eb)
   )
-  (fp_line (start 12.51 0.34) (end 12.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 0aaa42ba-e32b-4ae0-a145-671535351cdf))
-  (fp_line (start -12.51 0.34) (end -12.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 0eb573a7-cee6-4aee-8b65-8215c65ddf78))
-  (fp_line (start 12.51 -1.41) (end 11.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 57e05c28-6e4e-4ca0-b1c3-58e08a625bae))
-  (fp_line (start -12.51 -1.41) (end -11.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 7e89a540-edae-42ea-8271-dd69c1578a3e))
-  (fp_line (start -11.06 -1.41) (end -11.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 7f914624-274f-4deb-834a-1882a50e103a))
-  (fp_line (start -12.51 2.56) (end -12.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 928341b8-b60a-40af-aa88-bb0e7f0662ae))
-  (fp_line (start 12.51 3.11) (end 12.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 961586ba-f626-45cc-ab4f-8038c4dc1797))
-  (fp_line (start -12.51 3.11) (end 12.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp ec5feb89-4a72-4ac9-8372-d1a7111e521b))
-  (fp_line (start 12.9 -2.8) (end -12.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 2e911fe2-9d98-40f6-bc27-72d38f818b5b))
-  (fp_line (start -12.9 3.5) (end 12.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 58dbd25a-c845-4355-a974-383b115bf036))
-  (fp_line (start -12.9 -2.8) (end -12.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp ab226dfc-b9d7-4d2c-97fa-efbef49c4544))
-  (fp_line (start 12.9 3.5) (end 12.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp e2a272ff-d230-491e-b9f8-8e446e597cea))
-  (fp_line (start -10.5 -0.592893) (end -10 -1.3) (layer "F.Fab") (width 0.1) (tstamp 43dd11fb-dbd0-49b4-9c4c-4cb4f4c5e38c))
-  (fp_line (start 12.4 -1.3) (end 12.4 3) (layer "F.Fab") (width 0.1) (tstamp 67e5e18e-f418-447a-a92a-ec2c370d8a79))
-  (fp_line (start -11 -1.3) (end -10.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 6f039a80-dee5-454b-93a3-9b826931b33a))
-  (fp_line (start -12.4 3) (end 12.4 3) (layer "F.Fab") (width 0.1) (tstamp 72778a2d-3e0f-4850-9e6a-4c4c1f385b5b))
-  (fp_line (start -12.4 -1.3) (end -12.4 3) (layer "F.Fab") (width 0.1) (tstamp aeda25d8-ca3a-4fdd-b4df-e795c24f3e97))
-  (fp_line (start -12.4 -1.3) (end 12.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp cb084573-d35e-4732-80c6-a341c17fc2b9))
-  (pad "1" smd roundrect (at -10.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 297c9cb0-5836-460f-af33-25805881c198))
-  (pad "2" smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b3253d93-0e82-4a12-a7b7-67b12c87c740))
-  (pad "3" smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ff349517-b5c4-493c-bd8c-ced691d0a882))
-  (pad "4" smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0954724c-e6b8-4e9a-9e4d-a9c71ea264b7))
-  (pad "5" smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc997a8e-f948-4efb-a3e0-cc7e4fd7b895))
-  (pad "6" smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6581f881-0291-4b9e-b64f-ad6598f1706b))
-  (pad "7" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e25335ef-163f-4b87-90f9-30a72e0e8d2d))
-  (pad "8" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 64cdb4c4-f8dd-4c94-8329-ff9d598ff276))
-  (pad "9" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 69d2803e-50e8-4613-902d-063519f3e144))
-  (pad "10" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7bad087c-2acd-48fc-bac6-01dcbe832373))
-  (pad "11" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9d2b82d2-87be-44ce-869e-3aaabd1d4cf7))
-  (pad "12" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 92f97034-4288-42af-814f-73e5a3bd5218))
-  (pad "13" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8938129b-c880-4c55-87df-0840fee67a83))
-  (pad "14" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 172ec889-c3ab-491b-bc05-8eb113044478))
-  (pad "15" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp adb79a5f-cd20-469a-9eaf-5dbcd1385d6a))
-  (pad "16" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fdc88d70-057a-4fe8-85e2-3730570a26e4))
-  (pad "17" smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d177d819-3f5c-4b8c-8369-b3719e80132f))
-  (pad "18" smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8cfb58a0-3d31-41ee-9bc2-61529e3f4139))
-  (pad "19" smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3b6aa6d5-b05c-4d06-8fec-04be75a3c22b))
-  (pad "20" smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fcd172e3-d634-478d-b29e-068daa56aeed))
-  (pad "21" smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e479cd87-4349-4402-b782-97aa9bfe64f9))
-  (pad "22" smd roundrect (at 10.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d3ebc0d-1054-4813-ada1-9f82f969b1a6))
-  (pad "MP" smd roundrect (at -11.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5a94d455-ff72-462b-bf3c-6cc02bfe017f))
-  (pad "MP" smd roundrect (at 11.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f09586a7-bb8c-4f40-8b6a-bd459182fa18))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM22B-SHLS-TF_1x22-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal.kicad_mod
index 3b00aadec..179762782 100644
--- a/Connector_JST.pretty/JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,68 +1,82 @@
-(footprint "JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM26B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9697deff-bce8-430c-817e-ba5cba1ecbae)
   )
-  (fp_text value "JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b790a4f5-3b18-4a65-81ad-ea3cca435d38)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -14.4 -1.3) (end 14.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.51 0.34) (end -14.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.51 -1.41) (end -13.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.06 -1.41) (end -13.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.51 0.34) (end 14.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.51 -1.41) (end 13.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.51 2.56) (end -14.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.51 3.11) (end 14.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.51 3.11) (end 14.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.4 3) (end 14.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.4 -1.3) (end -14.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.4 -1.3) (end 14.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.9 -2.8) (end -14.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -14.9 3.5) (end 14.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.9 3.5) (end 14.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.9 -2.8) (end -14.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13 -1.3) (end -12.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.5 -0.592893) (end -12 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -12.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -11.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -10.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 21 smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 22 smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 23 smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 24 smd roundrect (at 10.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 25 smd roundrect (at 11.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 26 smd roundrect (at 12.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -13.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 13.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3054631e-85c8-4943-b7bb-a15a15dc1110)
   )
-  (fp_line (start -13.06 -1.41) (end -13.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 18d58d15-51f4-4964-bd20-2362d3be0096))
-  (fp_line (start -14.51 -1.41) (end -13.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 32033ce0-db39-4e7b-bbfd-e45218333d89))
-  (fp_line (start 14.51 -1.41) (end 13.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 448fabaa-149a-4dc8-8eff-cdbbed961439))
-  (fp_line (start 14.51 0.34) (end 14.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 598ca154-402f-4192-a9aa-67ed00ef1be9))
-  (fp_line (start -14.51 0.34) (end -14.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 74397ea4-466f-4d52-a667-d1e949fff3b9))
-  (fp_line (start -14.51 2.56) (end -14.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 824a81cb-4aa2-4b63-860c-0e70260687fa))
-  (fp_line (start 14.51 3.11) (end 14.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp 960ac96e-4cc9-4ad2-9a9a-3465d55362f3))
-  (fp_line (start -14.51 3.11) (end 14.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp e821acfd-d71b-4896-8ce2-695d294afe0e))
-  (fp_line (start -14.9 3.5) (end 14.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 0c3ebc50-d017-4221-b834-f29cdb9d1a78))
-  (fp_line (start 14.9 -2.8) (end -14.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 2dea6e7b-4206-4f2c-85c2-04a1b21aa6e8))
-  (fp_line (start -14.9 -2.8) (end -14.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 552b1661-3f81-4272-b38a-36653b8358bb))
-  (fp_line (start 14.9 3.5) (end 14.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 5b81f5c0-5585-4ea9-9cc6-4ea941303aeb))
-  (fp_line (start -13 -1.3) (end -12.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp 16845539-9eec-4a52-8c75-483218d25e05))
-  (fp_line (start -14.4 -1.3) (end 14.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 206246af-f4de-4fad-aa3e-b4403f50af2d))
-  (fp_line (start -12.5 -0.592893) (end -12 -1.3) (layer "F.Fab") (width 0.1) (tstamp 95e1976d-5cbb-4ca7-b6de-e5c93387cb33))
-  (fp_line (start 14.4 -1.3) (end 14.4 3) (layer "F.Fab") (width 0.1) (tstamp c2c119df-eaae-47b6-b9db-08404c5bee4c))
-  (fp_line (start -14.4 -1.3) (end -14.4 3) (layer "F.Fab") (width 0.1) (tstamp cc50b73b-6775-40cf-ad60-bf4326801bf5))
-  (fp_line (start -14.4 3) (end 14.4 3) (layer "F.Fab") (width 0.1) (tstamp d984e84d-f636-4e7d-8d1f-2dc70dabce67))
-  (pad "1" smd roundrect (at -12.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 358bab70-7ca2-4df0-a2f8-dc1b7cccab22))
-  (pad "2" smd roundrect (at -11.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a5dd80e7-579e-4ce1-92d4-d856240c09ec))
-  (pad "3" smd roundrect (at -10.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aa85af62-c69c-41c1-b779-b536cc3f2fab))
-  (pad "4" smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00cac6d4-7ac7-4281-a1f6-fe2ce2c44907))
-  (pad "5" smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7177a001-52a6-4572-b2b3-a56582bfbfb2))
-  (pad "6" smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7fb64b8c-a55d-4c4c-84eb-b94eb970aa80))
-  (pad "7" smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0fcca40d-fc0f-4dbf-b16d-5993f87423f8))
-  (pad "8" smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c73eeba1-2a10-45c4-8fd7-0b8e0f4947a6))
-  (pad "9" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 794a8e4c-c0b3-4890-9dbb-c8c803580083))
-  (pad "10" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c63d9e4b-88ca-4523-86b3-2298f0549fbd))
-  (pad "11" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d7bbc7a4-04f8-4508-92ed-0127df4cdda6))
-  (pad "12" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e2a74131-1099-4215-9452-54eb819bc8ff))
-  (pad "13" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a3541e52-c4b6-498b-9f55-e30583fe8004))
-  (pad "14" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a5e665bf-fff8-46d1-890e-c77ef3afa83d))
-  (pad "15" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a6894709-30b1-43c2-a27e-0999acd82ddc))
-  (pad "16" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f3c0e360-836e-4b71-9fee-4e5dd7aa7721))
-  (pad "17" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b9863adf-5082-4b98-b043-69477dc2e0e8))
-  (pad "18" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 523f43cf-1522-4bf9-969a-0f5a83778d3c))
-  (pad "19" smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 750bc490-cee2-464f-b28e-21f9cfb6f0bd))
-  (pad "20" smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f48d464e-f05f-4f5a-8647-928cb8e7ab85))
-  (pad "21" smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c3f40b3-f128-45c5-9f99-d99a169de690))
-  (pad "22" smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8d41e290-9053-4dc9-a492-fda9fa42e9e2))
-  (pad "23" smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2fdd5906-5e4e-4c03-9fd4-a951ceb99d1f))
-  (pad "24" smd roundrect (at 10.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cbeda864-b5b1-45d0-a3c1-e168b7e0488e))
-  (pad "25" smd roundrect (at 11.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6eae2fd5-e9cb-4399-a145-a4f77c55ae64))
-  (pad "26" smd roundrect (at 12.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 62cf5b13-40cf-4b53-9896-1a07fcd93022))
-  (pad "MP" smd roundrect (at 13.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a8308579-e9b0-4cd2-94a3-20d021c9f64b))
-  (pad "MP" smd roundrect (at -13.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cceac909-0c79-43b1-a520-96734a6dd0af))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM26B-SHLS-TF_1x26-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal.kicad_mod
index e7ee80095..a26004fdd 100644
--- a/Connector_JST.pretty/JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,72 +1,86 @@
-(footprint "JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SHL series connector, SM30B-SHLS-TF (http://www.jst-mfg.com/product/pdf/eng/eSHL.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SHL top entry")
+  (tags "connector JST SHL horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 64263e72-dd68-4f94-8dd9-f118673a1241)
   )
-  (fp_text value "JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal" (at 0 4.2) (layer "F.Fab")
+  (fp_text value JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal (at 0 4.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 78ff7f62-3182-43a4-b187-8603f7cd2be0)
   )
-  (fp_text user "${REFERENCE}" (at 0 0.5) (layer "F.Fab")
+  (fp_line (start -16.4 -1.3) (end 16.4 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.51 0.34) (end -16.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.51 -1.41) (end -15.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -15.06 -1.41) (end -15.06 -2.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.51 0.34) (end 16.51 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.51 -1.41) (end 15.06 -1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.51 2.56) (end -16.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.51 3.11) (end 16.51 3.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 16.51 3.11) (end 16.51 2.56)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -16.4 3) (end 16.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.4 -1.3) (end -16.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 16.4 -1.3) (end 16.4 3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -16.9 -2.8) (end -16.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -16.9 3.5) (end 16.9 3.5)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 16.9 3.5) (end 16.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 16.9 -2.8) (end -16.9 -2.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -15 -1.3) (end -14.5 -0.592893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.5 -0.592893) (end -14 -1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -14.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -13.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -12.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -11.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -10.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 21 smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 22 smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 23 smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 24 smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 25 smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 26 smd roundrect (at 10.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 27 smd roundrect (at 11.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 28 smd roundrect (at 12.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 29 smd roundrect (at 13.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 30 smd roundrect (at 14.5 -1.675) (size 0.6 1.25) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -15.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 15.95 1.45) (size 0.9 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user ${REFERENCE} (at 0 0.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 379b26e6-f049-4024-a70b-419083616dde)
   )
-  (fp_line (start -15.06 -1.41) (end -15.06 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 28b60015-58ce-4aed-9acb-e464f6004a3c))
-  (fp_line (start -16.51 3.11) (end 16.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp 57a0b367-0559-4c0b-951f-11aa509d8332))
-  (fp_line (start 16.51 0.34) (end 16.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp 7ee9f66c-8c9c-4593-b3ce-ed39a878fdf1))
-  (fp_line (start -16.51 2.56) (end -16.51 3.11) (layer "F.SilkS") (width 0.12) (tstamp a428d8f5-1217-4712-a434-3e7406e679f6))
-  (fp_line (start 16.51 -1.41) (end 15.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp b9b58dbb-ab97-4582-911f-90f1913dc92d))
-  (fp_line (start -16.51 -1.41) (end -15.06 -1.41) (layer "F.SilkS") (width 0.12) (tstamp bf3a4c45-5a6f-48d1-bc73-3f401007ebe4))
-  (fp_line (start -16.51 0.34) (end -16.51 -1.41) (layer "F.SilkS") (width 0.12) (tstamp d4ba2dfa-fc6c-4497-9584-4d80972c0342))
-  (fp_line (start 16.51 3.11) (end 16.51 2.56) (layer "F.SilkS") (width 0.12) (tstamp e78d7460-264f-4819-b330-0c291ed2ffc5))
-  (fp_line (start 16.9 3.5) (end 16.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp 10a381de-32d5-41df-8b4c-0eae9fc5f093))
-  (fp_line (start -16.9 3.5) (end 16.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp 92857669-875b-4f25-8e6a-5c1906a754e0))
-  (fp_line (start -16.9 -2.8) (end -16.9 3.5) (layer "F.CrtYd") (width 0.05) (tstamp acae9b94-0c0c-4aed-aa7a-f6b66a9dff8a))
-  (fp_line (start 16.9 -2.8) (end -16.9 -2.8) (layer "F.CrtYd") (width 0.05) (tstamp bb33a0cf-b27b-4258-bc3e-e92540b7847d))
-  (fp_line (start -16.4 -1.3) (end 16.4 -1.3) (layer "F.Fab") (width 0.1) (tstamp 5118553a-bfc9-4296-9718-c3b7e77e93a1))
-  (fp_line (start 16.4 -1.3) (end 16.4 3) (layer "F.Fab") (width 0.1) (tstamp 80a35db2-7b01-4793-9b2a-6225a287f21f))
-  (fp_line (start -16.4 -1.3) (end -16.4 3) (layer "F.Fab") (width 0.1) (tstamp 8a488186-0333-427d-bac5-05bcf15b1cc3))
-  (fp_line (start -14.5 -0.592893) (end -14 -1.3) (layer "F.Fab") (width 0.1) (tstamp 9dab8d16-1e87-43c7-9e16-f298dbc2cc0e))
-  (fp_line (start -16.4 3) (end 16.4 3) (layer "F.Fab") (width 0.1) (tstamp cdf2d8be-7fa4-4921-8621-6cf705e3cb18))
-  (fp_line (start -15 -1.3) (end -14.5 -0.592893) (layer "F.Fab") (width 0.1) (tstamp d7463b4a-c7fe-4f87-a2a1-3dbe2d4050e1))
-  (pad "1" smd roundrect (at -14.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 657a123f-8962-4dd2-a395-2a4b5490d7d8))
-  (pad "2" smd roundrect (at -13.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b7b86aff-089a-4749-9719-344e01208ddb))
-  (pad "3" smd roundrect (at -12.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 74636342-fdb2-4b0b-acfb-d3e4181b131e))
-  (pad "4" smd roundrect (at -11.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f0f725ce-00cf-4833-a664-434ef26fc0c8))
-  (pad "5" smd roundrect (at -10.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp de7ae854-1838-4d5e-8922-6434230b227c))
-  (pad "6" smd roundrect (at -9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 90a280fe-6621-4e51-9031-16ebfa3732d4))
-  (pad "7" smd roundrect (at -8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3cb41f82-46f5-41b3-92f5-b2c560c8b766))
-  (pad "8" smd roundrect (at -7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 56ab3797-e93b-4ab8-a2de-b046dc998cc6))
-  (pad "9" smd roundrect (at -6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f6b6e68c-2819-40c2-a687-613ed7cccda5))
-  (pad "10" smd roundrect (at -5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e6ecd9f4-66c9-49f2-aa31-1013b12dfa98))
-  (pad "11" smd roundrect (at -4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e4c5aab6-eb8d-4edd-b083-8985785b51a1))
-  (pad "12" smd roundrect (at -3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4ec97829-c659-4f4a-8694-98fe6dd40e7f))
-  (pad "13" smd roundrect (at -2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1a4dae46-558a-4a87-9393-cf484f59eb77))
-  (pad "14" smd roundrect (at -1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e10a70c7-73f4-4ee6-bba6-8c3e217b3302))
-  (pad "15" smd roundrect (at -0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b8e37930-66b3-43a2-93fa-40afdaf81bb5))
-  (pad "16" smd roundrect (at 0.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c5121e98-ab71-4189-9724-3ed49d0c407f))
-  (pad "17" smd roundrect (at 1.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e333555-eb85-4a9e-91a1-db4d57f46f1d))
-  (pad "18" smd roundrect (at 2.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 65c543c8-84e1-4a5b-9f5f-65a868b64476))
-  (pad "19" smd roundrect (at 3.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4f7988e8-4265-46ff-83cb-921d8ddb33de))
-  (pad "20" smd roundrect (at 4.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 08874940-5d7d-488e-a2b5-f1f1fda61ce0))
-  (pad "21" smd roundrect (at 5.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0b619447-e0c5-4090-8e61-b8a38d133cf1))
-  (pad "22" smd roundrect (at 6.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7c18896c-2bc8-46d0-a530-fc7342605fbe))
-  (pad "23" smd roundrect (at 7.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1d809017-230e-4b6f-b5d2-c7a37ccac6ed))
-  (pad "24" smd roundrect (at 8.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0b9ebea3-a3bd-4253-9041-e00d76407851))
-  (pad "25" smd roundrect (at 9.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bebcaa73-f791-4bb4-83c1-b3f27c688151))
-  (pad "26" smd roundrect (at 10.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 19f45e45-aafe-4757-885a-f5c6029f9649))
-  (pad "27" smd roundrect (at 11.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3b99b862-f403-40bd-91b0-068b83465e0b))
-  (pad "28" smd roundrect (at 12.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bdae7078-704c-474d-9545-9926dc20de37))
-  (pad "29" smd roundrect (at 13.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b1cb0d9d-c4a5-4597-8ea5-55c272c0211a))
-  (pad "30" smd roundrect (at 14.5 -1.675) (size 0.6 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a591577c-413a-4957-a792-fc53fcc4738b))
-  (pad "MP" smd roundrect (at -15.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2ad2f0bf-cd94-4f40-aa61-07777eb75ba0))
-  (pad "MP" smd roundrect (at 15.95 1.45) (size 0.9 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5a5ad3b-e70a-4d68-9333-3b669dd65e2e))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SHL_SM30B-SHLS-TF_1x30-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical.kicad_mod
index e2812d11c..d998f3278 100644
--- a/Connector_JST.pretty/JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,50 +1,70 @@
-(footprint "JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM02B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6767a7bd-ddbb-4837-8d3f-fc3e67b21013)
   )
-  (fp_text value "JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f111c656-dc8c-454c-ab1c-f73268dd84d3)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -2 1) (end 2 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.11 -0.04) (end -2.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.11 1.11) (end -1.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.06 1.11) (end -1.06 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.11 -0.04) (end 2.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.11 1.11) (end 1.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.94 -2.01) (end 0.94 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2 -1.9) (end 2 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 1) (end -2 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 1) (end 2 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -1.55) (end -0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -0.95) (end -0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -0.95) (end -0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -1.55) (end -0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -1.55) (end 0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -0.95) (end 0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -0.95) (end 0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -1.55) (end 0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.9 -2.6) (end -2.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.9 2.6) (end 2.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.9 2.6) (end 2.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.9 -2.6) (end -2.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1 1) (end -0.5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0.292893) (end 0 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 1.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 02771545-f622-4c31-a4f1-43ec38cb4f19)
   )
-  (fp_line (start 2.11 -0.04) (end 2.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 111c04c8-c92b-4960-852f-39f71600f536))
-  (fp_line (start -2.11 -0.04) (end -2.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 13c4f272-43cd-4a81-b6a7-4918aead733a))
-  (fp_line (start -2.11 1.11) (end -1.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 23ec7d1d-fdd4-4f5c-be7b-c7049cf479d7))
-  (fp_line (start -0.94 -2.01) (end 0.94 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 4e1a9cd0-0542-41a8-bc68-c11c50ad5868))
-  (fp_line (start -1.06 1.11) (end -1.06 2.1) (layer "F.SilkS") (width 0.12) (tstamp f018b565-dee0-406d-a84b-c0c9acd7bf52))
-  (fp_line (start 2.11 1.11) (end 1.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp f8876e4d-7471-4aa8-8fed-783a3828d573))
-  (fp_line (start 2.9 2.6) (end 2.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 5ba876ff-9450-45be-80b4-feb60c8cc6b7))
-  (fp_line (start 2.9 -2.6) (end -2.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp b4f0d6cc-517a-49b3-a50c-b99ce74d11b4))
-  (fp_line (start -2.9 2.6) (end 2.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp cfc89303-7728-4759-8af0-4597b0652306))
-  (fp_line (start -2.9 -2.6) (end -2.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp f2155daf-d3e5-4d87-85f1-6eae9fff317f))
-  (fp_line (start 0.65 -0.95) (end 0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 03cac6a5-de68-4589-9fa0-c1386edb269e))
-  (fp_line (start -2 1) (end 2 1) (layer "F.Fab") (width 0.1) (tstamp 2264aa2a-4b91-4118-aa2c-7a9b6092e279))
-  (fp_line (start -0.35 -0.95) (end -0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 5ebc720d-3dc9-40ad-99d3-cbeeb59cff21))
-  (fp_line (start 0.35 -0.95) (end 0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6b7e27e5-c423-40fb-ad99-e8bafc00b24d))
-  (fp_line (start 0.65 -1.55) (end 0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6c087d4d-c71b-4ed0-abf8-198113cda3a3))
-  (fp_line (start -1 1) (end -0.5 0.292893) (layer "F.Fab") (width 0.1) (tstamp 6c2964f0-3d22-471d-befa-183a63a87449))
-  (fp_line (start -0.65 -0.95) (end -0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 766f14ed-b942-4b6f-8568-7ac02d2a4e2e))
-  (fp_line (start -0.35 -1.55) (end -0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 8b839369-0f99-43b0-9a29-0565d26fab83))
-  (fp_line (start -2 1) (end -2 -1.9) (layer "F.Fab") (width 0.1) (tstamp 8cf8f986-6e7f-409d-b83e-4d317cb42f00))
-  (fp_line (start -2 -1.9) (end 2 -1.9) (layer "F.Fab") (width 0.1) (tstamp 98f2e30e-9f02-4200-b869-a3d79cd8575a))
-  (fp_line (start -0.5 0.292893) (end 0 1) (layer "F.Fab") (width 0.1) (tstamp 9d6ffb0b-047c-49a3-ba80-eca5fec97f1f))
-  (fp_line (start -0.65 -1.55) (end -0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp a6db1ecb-d2f8-40e9-bd03-42545bee1bb0))
-  (fp_line (start 0.35 -1.55) (end 0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp e49967a7-5b86-4545-93c3-b6159b057f7d))
-  (fp_line (start 2 1) (end 2 -1.9) (layer "F.Fab") (width 0.1) (tstamp f97d947e-08fa-47bd-9fc1-b70d0c8b2fba))
-  (pad "1" smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fdd1209b-0b8e-447e-baf1-53a0553f954d))
-  (pad "2" smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 015e0461-69b9-4063-b06b-397aa2246ff1))
-  (pad "MP" smd roundrect (at -1.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5f85d8dd-e916-4570-993c-47395845c6b5))
-  (pad "MP" smd roundrect (at 1.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 78b63b54-0e95-441a-876b-cfe4b9529144))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM02B-SRSS-TB_1x02-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical.kicad_mod
index 8e5002758..8b29cf15a 100644
--- a/Connector_JST.pretty/JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,55 +1,79 @@
-(footprint "JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM03B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a774bd5c-d55b-4ffd-9506-0b928e5d8b02)
   )
-  (fp_text value "JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a3bb1a0d-4652-4624-bc56-e3a3a1f83f36)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -2.5 1) (end 2.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.61 -0.04) (end -2.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.61 1.11) (end -1.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.56 1.11) (end -1.56 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.61 -0.04) (end 2.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.61 1.11) (end 1.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.44 -2.01) (end 1.44 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.5 -1.9) (end 2.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 1) (end -2.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 1) (end 2.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -1.55) (end -1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -0.95) (end -0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -0.95) (end -0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -1.55) (end -1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -1.55) (end -0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -0.95) (end 0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -0.95) (end 0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -1.55) (end -0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -1.55) (end 0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -0.95) (end 1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -0.95) (end 1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -1.55) (end 0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.4 -2.6) (end -3.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.4 2.6) (end 3.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.4 2.6) (end 3.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.4 -2.6) (end -3.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.5 1) (end -1 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0.292893) (end -0.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a444e03e-c5a2-453b-a889-db0d279112a9)
   )
-  (fp_line (start -1.56 1.11) (end -1.56 2.1) (layer "F.SilkS") (width 0.12) (tstamp 1d762ec0-6e91-45cc-9c32-710230617d49))
-  (fp_line (start 2.61 1.11) (end 1.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 1de56c34-3a09-4179-b355-e1d0f1b7a4a6))
-  (fp_line (start -2.61 -0.04) (end -2.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 277a745e-d060-45ba-ae8f-122f84377949))
-  (fp_line (start -2.61 1.11) (end -1.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 58338f74-223c-48b4-bcd4-ddcd9320da91))
-  (fp_line (start 2.61 -0.04) (end 2.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 5e0c45af-6b42-4d37-8d7f-0756ffef069b))
-  (fp_line (start -1.44 -2.01) (end 1.44 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 7ee11169-cc65-4383-8b11-13acf6700d9e))
-  (fp_line (start 3.4 2.6) (end 3.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 106ef9e4-da86-4c83-beba-7b4feec00428))
-  (fp_line (start 3.4 -2.6) (end -3.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 37281e6e-7936-4a2f-a34d-a8e21ccfbf3f))
-  (fp_line (start -3.4 -2.6) (end -3.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 77ce1173-4fb1-462f-aa6b-d1214db05d66))
-  (fp_line (start -3.4 2.6) (end 3.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp a83adef3-ed4f-44a6-8446-9203dca043b9))
-  (fp_line (start 0.85 -0.95) (end 1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 08c3f42d-2559-41d3-bfdf-1164a2c5c23a))
-  (fp_line (start 0.85 -1.55) (end 0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 309649d5-7e83-4105-b9ae-9f79e3e93fe5))
-  (fp_line (start -2.5 1) (end -2.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 4ef11a55-ccc4-4205-8d12-d156744e796a))
-  (fp_line (start -0.15 -1.55) (end -0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 5f67cda9-0e21-4552-8ac4-20b9a76f79f4))
-  (fp_line (start 2.5 1) (end 2.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 6b15f4ce-6ebe-483e-9ac4-605025cfdf18))
-  (fp_line (start -1.15 -0.95) (end -0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6b6084ab-3130-4069-aaaa-95f54eb5c7f8))
-  (fp_line (start -0.85 -0.95) (end -0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 71379c0a-8905-457a-b359-dd5c2dddd334))
-  (fp_line (start 1.15 -1.55) (end 0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 86f10455-71df-4b87-bfc4-ed8802c7e626))
-  (fp_line (start -0.15 -0.95) (end 0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9a3a616a-9adb-43e2-9a45-faf4b43f04e9))
-  (fp_line (start -1.15 -1.55) (end -1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9c5b1d48-ba4a-4452-8498-ebe7ad01d108))
-  (fp_line (start 0.15 -0.95) (end 0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp b06b5b42-0f28-4e16-b904-da8315cf0765))
-  (fp_line (start -1.5 1) (end -1 0.292893) (layer "F.Fab") (width 0.1) (tstamp dccdb458-c140-41f1-9a3c-0c414d75105e))
-  (fp_line (start 1.15 -0.95) (end 1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp e3dd2c4a-918c-4813-ad38-98ec63cb1f70))
-  (fp_line (start -0.85 -1.55) (end -1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp e696fee7-a0af-46e1-88e7-3c742688c85a))
-  (fp_line (start -2.5 1) (end 2.5 1) (layer "F.Fab") (width 0.1) (tstamp ec062ebe-f81c-4aad-a4d2-574b9f25d2c6))
-  (fp_line (start -1 0.292893) (end -0.5 1) (layer "F.Fab") (width 0.1) (tstamp f3f8d6a2-5e20-4d88-bad3-2f48d36beabd))
-  (fp_line (start -2.5 -1.9) (end 2.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp fcec576c-abdc-4096-8bc7-279d14991a42))
-  (fp_line (start 0.15 -1.55) (end -0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp fef03acf-6ef1-4b29-9c52-12bda18b8701))
-  (pad "1" smd roundrect (at -1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b2b15d28-6b40-4000-82ca-bcb4a31feb90))
-  (pad "2" smd roundrect (at 0 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1fd48f59-abd8-4d4e-b9e9-84063a928634))
-  (pad "3" smd roundrect (at 1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 57482086-9ed3-4a73-beb4-cd46e6590308))
-  (pad "MP" smd roundrect (at -2.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp e9d88a38-528a-41e3-91a4-376d2a2c1b83))
-  (pad "MP" smd roundrect (at 2.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp f6b8e415-8255-401d-bf6d-06bea7fb4b01))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical.kicad_mod
index 0183850f2..0f4758a68 100644
--- a/Connector_JST.pretty/JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,60 +1,88 @@
-(footprint "JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM04B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1aad7067-eb1d-43eb-8e4f-7029246e8d76)
   )
-  (fp_text value "JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c5beaa7c-270b-47e8-876d-5db859218efe)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -3 1) (end 3 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.11 -0.04) (end -3.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.11 1.11) (end -2.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.06 1.11) (end -2.06 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.11 -0.04) (end 3.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.11 1.11) (end 2.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.94 -2.01) (end 1.94 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3 -1.9) (end 3 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 1) (end -3 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3 1) (end 3 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -1.55) (end -1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -0.95) (end -1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -0.95) (end -1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -1.55) (end -1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -1.55) (end -0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -0.95) (end -0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -0.95) (end -0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -1.55) (end -0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -1.55) (end 0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -0.95) (end 0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -0.95) (end 0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -1.55) (end 0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -1.55) (end 1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -0.95) (end 1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -0.95) (end 1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -1.55) (end 1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.9 -2.6) (end -3.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.9 2.6) (end 3.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.9 2.6) (end 3.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.9 -2.6) (end -3.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2 1) (end -1.5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 0.292893) (end -1 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 58210749-f688-4a49-a19d-8e22828178aa)
   )
-  (fp_line (start 3.11 1.11) (end 2.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 7236cda5-5375-4fa6-8280-0edc101ea8e6))
-  (fp_line (start -1.94 -2.01) (end 1.94 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 8aab3630-306a-4465-9221-c23e50817cbc))
-  (fp_line (start 3.11 -0.04) (end 3.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp a7b0473a-b247-4df6-b486-a48fc8dd2f8f))
-  (fp_line (start -3.11 -0.04) (end -3.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp a920a000-5c0b-40be-ac0b-26ba50f3613a))
-  (fp_line (start -2.06 1.11) (end -2.06 2.1) (layer "F.SilkS") (width 0.12) (tstamp b925258d-f6c8-4e46-9691-79b4e26afd88))
-  (fp_line (start -3.11 1.11) (end -2.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp fe8f8b98-4db4-4570-a11c-f6f80a65c9b3))
-  (fp_line (start 3.9 2.6) (end 3.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 00f531a1-2aac-4983-a753-2316706bd5e2))
-  (fp_line (start 3.9 -2.6) (end -3.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 2375dee7-7ae8-4658-8138-168000ebaed0))
-  (fp_line (start -3.9 -2.6) (end -3.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 7731f79d-1fc7-4c1f-a143-829b9afa8aa0))
-  (fp_line (start -3.9 2.6) (end 3.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp d6943688-3858-449f-b957-8b3020a8ec50))
-  (fp_line (start -1.35 -1.55) (end -1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 1252735c-790c-4d54-9268-4fa3d158f9b2))
-  (fp_line (start -0.65 -1.55) (end -0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 12ac934b-9194-4cd6-90ae-b567f36baf5f))
-  (fp_line (start 1.35 -1.55) (end 1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 18b9a086-9a79-4ec9-944d-0f4841b2bc24))
-  (fp_line (start -1.35 -0.95) (end -1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 27577389-b9d9-495e-b40e-8b929acf228a))
-  (fp_line (start -2 1) (end -1.5 0.292893) (layer "F.Fab") (width 0.1) (tstamp 5077f77d-8104-4598-92b5-2f47e7096e49))
-  (fp_line (start 0.65 -0.95) (end 0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 5b67ee62-80c4-4cf6-867d-0ffcfdb5db34))
-  (fp_line (start -1.5 0.292893) (end -1 1) (layer "F.Fab") (width 0.1) (tstamp 601721c0-2f9d-4616-88aa-204ca4efdcf8))
-  (fp_line (start -3 1) (end 3 1) (layer "F.Fab") (width 0.1) (tstamp 7467a072-fe37-4619-9ae8-6624cd3a713e))
-  (fp_line (start 3 1) (end 3 -1.9) (layer "F.Fab") (width 0.1) (tstamp 7b022892-678f-49b3-a5cc-18325772b5aa))
-  (fp_line (start -0.65 -0.95) (end -0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 7e12e4dc-0d42-4856-97ba-a257d43b6ce6))
-  (fp_line (start -1.65 -1.55) (end -1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 7e74a832-278b-479f-ae1c-2a8d058daaa3))
-  (fp_line (start 0.35 -0.95) (end 0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 87f8a889-2510-4af1-b993-63b5e2b55320))
-  (fp_line (start -1.65 -0.95) (end -1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8ca9f963-1dea-436b-a3f7-6be7ebbe8149))
-  (fp_line (start 0.65 -1.55) (end 0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 8f25c366-1f16-44ba-9dd0-ee54724760e7))
-  (fp_line (start -0.35 -1.55) (end -0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 99a75815-cb05-4933-8fcb-5790ec58973e))
-  (fp_line (start -0.35 -0.95) (end -0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 9bfc1718-15ce-4cd4-b054-0867a359b285))
-  (fp_line (start -3 1) (end -3 -1.9) (layer "F.Fab") (width 0.1) (tstamp b3d0ae84-daef-48a1-b0ea-d1411c080c2b))
-  (fp_line (start 1.65 -0.95) (end 1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp c394fbe1-d540-43b7-825b-d7e35c9ef47d))
-  (fp_line (start 1.35 -0.95) (end 1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp cacf64b5-8783-4c6c-9931-25f062cae531))
-  (fp_line (start -3 -1.9) (end 3 -1.9) (layer "F.Fab") (width 0.1) (tstamp e837e4cb-c84c-4c4b-a631-395b825f0b51))
-  (fp_line (start 1.65 -1.55) (end 1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp e928b750-fab0-49c9-8236-bcaff11a51cc))
-  (fp_line (start 0.35 -1.55) (end 0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp e96257ce-a4f6-4313-8734-f4ad78bd8084))
-  (pad "1" smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d5eec63e-cdac-4fe9-93aa-d31854931e52))
-  (pad "2" smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 41120383-5217-4ef5-9ee7-42283196e114))
-  (pad "3" smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 81cb03af-0e8b-4419-b18a-3a248ff1b44f))
-  (pad "4" smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1b25e95c-d109-42e5-9539-1798bf87920b))
-  (pad "MP" smd roundrect (at -2.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5cb043bf-fb71-4f5f-a9b4-86ce446c8810))
-  (pad "MP" smd roundrect (at 2.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 85d1c021-cf8e-48e1-b3fd-12b4fd5ee04d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM04B-SRSS-TB_1x04-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical.kicad_mod
index efae470f9..bf84db33f 100644
--- a/Connector_JST.pretty/JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,65 +1,97 @@
-(footprint "JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM05B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a0cc168e-2d6f-428f-8f68-3f37652790f7)
   )
-  (fp_text value "JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 65344e5b-6896-4dc8-9362-7be11ab261dd)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -3.5 1) (end 3.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.61 -0.04) (end -3.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.61 1.11) (end -2.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.56 1.11) (end -2.56 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 -0.04) (end 3.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 1.11) (end 2.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.44 -2.01) (end 2.44 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.5 -1.9) (end 3.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 1) (end -3.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 1) (end 3.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -1.55) (end -2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -0.95) (end -1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -0.95) (end -1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.55) (end -2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -1.55) (end -1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -0.95) (end -0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -0.95) (end -0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -1.55) (end -1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -1.55) (end -0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -0.95) (end 0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -0.95) (end 0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -1.55) (end -0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -1.55) (end 0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -0.95) (end 1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -0.95) (end 1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -1.55) (end 0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.55) (end 1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -0.95) (end 2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -0.95) (end 2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -1.55) (end 1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 -2.6) (end -4.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.4 2.6) (end 4.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 2.6) (end 4.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 -2.6) (end -4.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.5 1) (end -2 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0.292893) (end -1.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 3.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3acfe234-89ea-482d-8f1d-06ab681428e1)
   )
-  (fp_line (start -3.61 -0.04) (end -3.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 59b14749-5ac1-47bb-bcd1-668780f1ec35))
-  (fp_line (start 3.61 1.11) (end 2.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 8aff4649-fa0a-48a3-81e1-fa8e4e383c5e))
-  (fp_line (start -2.56 1.11) (end -2.56 2.1) (layer "F.SilkS") (width 0.12) (tstamp 9c0cd90d-38de-4444-a2ec-079356f5a8aa))
-  (fp_line (start -3.61 1.11) (end -2.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp ef09f508-a9e7-437d-af81-319a5a83adf1))
-  (fp_line (start -2.44 -2.01) (end 2.44 -2.01) (layer "F.SilkS") (width 0.12) (tstamp fa306cf1-58aa-47ad-a107-00b9a8efdd7e))
-  (fp_line (start 3.61 -0.04) (end 3.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp fb8f9669-6847-477d-897e-6a2c2492056d))
-  (fp_line (start -4.4 2.6) (end 4.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 077b53fd-6d83-4aa0-9167-9ea5618413bf))
-  (fp_line (start 4.4 2.6) (end 4.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 6eecac8c-d15a-4604-ac8c-3393355c1d28))
-  (fp_line (start 4.4 -2.6) (end -4.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 90dd0443-bbe5-4721-9fc8-053633b21bb2))
-  (fp_line (start -4.4 -2.6) (end -4.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp f6f02732-8c99-4728-b3b5-3a514950e4f7))
-  (fp_line (start -0.15 -0.95) (end 0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 081cebc6-24e1-4473-bf42-e5ef19965b3a))
-  (fp_line (start 3.5 1) (end 3.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 14885a9c-2e23-4884-a11a-854b165a07b1))
-  (fp_line (start 2.15 -0.95) (end 2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 1a10154e-e6cf-4baa-be6f-cb59a80bbd66))
-  (fp_line (start -3.5 1) (end -3.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 1f0d29ff-5930-43de-885d-7186795d4ba9))
-  (fp_line (start -3.5 1) (end 3.5 1) (layer "F.Fab") (width 0.1) (tstamp 234ff74e-a4ce-4f6e-865e-ce17eb71e58a))
-  (fp_line (start -2.15 -0.95) (end -1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 2af17f11-6c12-44ea-9fc7-64157d043526))
-  (fp_line (start 0.85 -0.95) (end 1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 34e3194e-83a9-4507-8c54-7afc37165a8d))
-  (fp_line (start -2.15 -1.55) (end -2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 4a7748f2-8f87-49d6-8cbb-8d59912590ff))
-  (fp_line (start -1.85 -0.95) (end -1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4df96f4d-316a-4ed7-aa23-b44b966d0333))
-  (fp_line (start 0.85 -1.55) (end 0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 695e098e-90c0-450d-bb83-3d510a72b940))
-  (fp_line (start 0.15 -0.95) (end 0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6b0b12df-7a28-4181-a49d-7972ab0036cb))
-  (fp_line (start -3.5 -1.9) (end 3.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 73dc949f-8fca-459f-902a-c9e7aa6d1a59))
-  (fp_line (start 1.15 -0.95) (end 1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 78e3d809-6470-4f04-98b6-73168ba43a60))
-  (fp_line (start -0.85 -1.55) (end -1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 8a236e10-333a-4955-9bd3-2dd6bd1f423e))
-  (fp_line (start -1.15 -0.95) (end -0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8c32c9a5-204f-49d9-96b7-0a0d36bd59c1))
-  (fp_line (start -1.85 -1.55) (end -2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 8dcf3341-663a-4f30-8e47-6ec7742a1c0a))
-  (fp_line (start 0.15 -1.55) (end -0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 9862d15c-7e54-4b07-8cb0-8a5386d4c0d7))
-  (fp_line (start -2.5 1) (end -2 0.292893) (layer "F.Fab") (width 0.1) (tstamp 9e504033-a49b-4197-8c8a-b5d9e590c218))
-  (fp_line (start 1.15 -1.55) (end 0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp a0a08a25-9242-4bfd-97e2-bc49ab77c694))
-  (fp_line (start -0.85 -0.95) (end -0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp a42011b6-4ce0-44be-a4a5-f9420f1649dc))
-  (fp_line (start 2.15 -1.55) (end 1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp a9a0d6a9-793b-456b-b32c-a418893d58c7))
-  (fp_line (start 1.85 -0.95) (end 2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp ada6c2e8-d19c-4e85-8e51-cc1059f77184))
-  (fp_line (start -0.15 -1.55) (end -0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp bcbcbed5-00e2-424c-aacd-f976ce8254f5))
-  (fp_line (start -1.15 -1.55) (end -1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp c5e6356d-0b98-4ad8-9c8c-c9c1542dc943))
-  (fp_line (start 1.85 -1.55) (end 1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp e80fd9d8-a03d-41db-962c-e89af1cea17d))
-  (fp_line (start -2 0.292893) (end -1.5 1) (layer "F.Fab") (width 0.1) (tstamp ee8cee8c-a99a-4b34-bb11-f804241002f3))
-  (pad "1" smd roundrect (at -2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f8ae47b-635e-469e-8487-49ad401e72fc))
-  (pad "2" smd roundrect (at -1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a2680451-8e8c-410f-9757-c64d8af7f470))
-  (pad "3" smd roundrect (at 0 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 992feaa7-b542-4c22-a6b1-4a4f73eaf304))
-  (pad "4" smd roundrect (at 1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 905069cd-e323-4380-b2f0-19a461171e7c))
-  (pad "5" smd roundrect (at 2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e23176c-5c02-4c7f-bb97-498346e4d102))
-  (pad "MP" smd roundrect (at 3.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 0af3ec9a-e9da-413a-ab78-5b5d112a36ad))
-  (pad "MP" smd roundrect (at -3.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp aa9e4247-b604-492f-aac9-85b460cdd870))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM05B-SRSS-TB_1x05-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical.kicad_mod
index 5a5c22a03..0ee4dadae 100644
--- a/Connector_JST.pretty/JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,70 +1,106 @@
-(footprint "JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM06B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5eba82ea-2185-4eb4-b713-4939ed02ea5f)
   )
-  (fp_text value "JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a17a2517-f5cf-4323-a07a-17efa7fe741d)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -4 1) (end 4 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.11 -0.04) (end -4.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.11 1.11) (end -3.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.06 1.11) (end -3.06 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.11 -0.04) (end 4.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.11 1.11) (end 3.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.94 -2.01) (end 2.94 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4 -1.9) (end 4 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 1) (end -4 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 1) (end 4 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -1.55) (end -2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -0.95) (end -2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -0.95) (end -2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -1.55) (end -2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -1.55) (end -1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -0.95) (end -1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -0.95) (end -1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -1.55) (end -1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -1.55) (end -0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -0.95) (end -0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -0.95) (end -0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -1.55) (end -0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -1.55) (end 0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -0.95) (end 0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -0.95) (end 0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -1.55) (end 0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -1.55) (end 1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -0.95) (end 1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -0.95) (end 1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -1.55) (end 1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -1.55) (end 2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -0.95) (end 2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -0.95) (end 2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -1.55) (end 2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.9 -2.6) (end -4.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.9 2.6) (end 4.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.9 2.6) (end 4.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.9 -2.6) (end -4.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3 1) (end -2.5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0.292893) (end -2 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 3.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4a10f97e-73f0-427b-ab90-243a440f4d60)
   )
-  (fp_line (start -2.94 -2.01) (end 2.94 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 4a893019-e973-43fc-8e94-b783c59402c1))
-  (fp_line (start 4.11 -0.04) (end 4.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 741f6ce3-265e-4bd1-bc51-bb4aa972d8a7))
-  (fp_line (start -4.11 -0.04) (end -4.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp cda98a9b-9123-4e9f-8ea4-131d0a2ad6a8))
-  (fp_line (start -4.11 1.11) (end -3.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp d5a92eb1-7350-404b-b657-7f03d5fe78fc))
-  (fp_line (start 4.11 1.11) (end 3.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp db94fa5a-2ad2-42fd-b7d3-06a42355c706))
-  (fp_line (start -3.06 1.11) (end -3.06 2.1) (layer "F.SilkS") (width 0.12) (tstamp e296fb11-a2cb-4438-8196-eb1014c454ed))
-  (fp_line (start -4.9 -2.6) (end -4.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 0e667128-926c-455c-953c-0bdead628d99))
-  (fp_line (start 4.9 2.6) (end 4.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 4f92a97e-b1ee-49de-8fdb-a063b52115af))
-  (fp_line (start 4.9 -2.6) (end -4.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp adba3e0e-e537-4ff3-a59c-a1817aea7ab5))
-  (fp_line (start -4.9 2.6) (end 4.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp c4c2038d-c003-40a4-bcd3-bbff971e1766))
-  (fp_line (start -0.65 -0.95) (end -0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0b8b188d-06e4-404e-95b7-6815b1812da2))
-  (fp_line (start -4 1) (end -4 -1.9) (layer "F.Fab") (width 0.1) (tstamp 13892a4b-3a91-45a2-9dd7-9c7a65f70292))
-  (fp_line (start 1.35 -1.55) (end 1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1e5d9db7-9f64-479e-b914-5dd681ae4d33))
-  (fp_line (start 2.65 -1.55) (end 2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 2146547d-3f74-4171-80c6-9188f79177e3))
-  (fp_line (start -2.65 -1.55) (end -2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 238a4606-34d4-4e9f-9fae-3ca5a33ff27c))
-  (fp_line (start -4 -1.9) (end 4 -1.9) (layer "F.Fab") (width 0.1) (tstamp 2fee7894-881e-4461-89f8-4293970ecd59))
-  (fp_line (start -1.35 -0.95) (end -1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 306a302d-5401-4849-b079-5df8d5cb61ce))
-  (fp_line (start 4 1) (end 4 -1.9) (layer "F.Fab") (width 0.1) (tstamp 317ff2bc-e5b4-454e-9d6f-4852dddfef2e))
-  (fp_line (start 2.65 -0.95) (end 2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3922a08c-51ee-40d1-99fd-9f059d2b60ba))
-  (fp_line (start -0.35 -1.55) (end -0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 47b5b004-0073-4f53-9ee9-ee4512b84289))
-  (fp_line (start -0.65 -1.55) (end -0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 51034924-29dd-40d1-93f7-eb84d9d5da29))
-  (fp_line (start 2.35 -0.95) (end 2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 5210b6bd-3395-47bf-b589-38f4f2a41fc6))
-  (fp_line (start 1.35 -0.95) (end 1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 61d844f1-3182-41eb-9536-c38936591594))
-  (fp_line (start -2.35 -1.55) (end -2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 740b23c6-f73b-4a4d-8a8c-2e97c4574501))
-  (fp_line (start 1.65 -0.95) (end 1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 75bd522f-e20a-413d-bb79-eec2d8578d08))
-  (fp_line (start -1.65 -1.55) (end -1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8293fa72-6749-419d-b198-b975b74f88f3))
-  (fp_line (start -2.5 0.292893) (end -2 1) (layer "F.Fab") (width 0.1) (tstamp 82fa0ec4-a763-4dea-a685-0e1a34f5b7b3))
-  (fp_line (start -1.35 -1.55) (end -1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 907e88b9-79bb-43ac-9900-7789762aea9a))
-  (fp_line (start -0.35 -0.95) (end -0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp a46b87b9-9973-4a53-811c-6057573ff16a))
-  (fp_line (start 0.65 -1.55) (end 0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp a68971ad-b5af-455e-933c-a205f343d6c3))
-  (fp_line (start 0.35 -1.55) (end 0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp aca2daaf-d5a7-476e-ba8e-1a4d02580a1c))
-  (fp_line (start -4 1) (end 4 1) (layer "F.Fab") (width 0.1) (tstamp b1670fce-0af5-4b2a-9a60-29cd6a694bc4))
-  (fp_line (start 2.35 -1.55) (end 2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp b61024ac-dd5f-4b7a-bc46-04254ffd2ece))
-  (fp_line (start 1.65 -1.55) (end 1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp bf76a5f3-ca92-4c7f-949a-4612c37da7eb))
-  (fp_line (start 0.35 -0.95) (end 0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp bff6c832-3ffc-4462-b3d0-a82e57e582e1))
-  (fp_line (start -2.65 -0.95) (end -2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp c27dc71b-c1f4-4f9e-91cf-4348c86556cb))
-  (fp_line (start 0.65 -0.95) (end 0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp e37335d8-8b76-414f-957c-49f69c2ff358))
-  (fp_line (start -3 1) (end -2.5 0.292893) (layer "F.Fab") (width 0.1) (tstamp f0ed687c-b328-423e-8389-eae6c93acbc4))
-  (fp_line (start -2.35 -0.95) (end -2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp fab9c410-e2ac-4e0f-a633-6bceb08d551c))
-  (fp_line (start -1.65 -0.95) (end -1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp ffacf7b6-ea3d-4f4d-91cf-3c3a507376a1))
-  (pad "1" smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ec1f8ef4-b550-45cd-b818-53d81d7e860a))
-  (pad "2" smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c8171b11-c1b2-4058-9fff-f4b922ee1ee3))
-  (pad "3" smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 24990f55-54c1-4609-9a76-2544ed4423bc))
-  (pad "4" smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e267998-bcb6-4f5b-9afa-70cebbfec103))
-  (pad "5" smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dc9d6749-b98b-4752-8ea6-215b517959d0))
-  (pad "6" smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b1d059fd-1b8b-4044-a4ec-9c37e814d8da))
-  (pad "MP" smd roundrect (at 3.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 3dccdfc6-8118-47f5-a6fd-1bf8469dd36e))
-  (pad "MP" smd roundrect (at -3.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp a2e8dc2f-5770-4ce2-bf5d-1aace4b9d796))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM06B-SRSS-TB_1x06-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical.kicad_mod
index 5aa2bbe0a..e82ff13c4 100644
--- a/Connector_JST.pretty/JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,75 +1,115 @@
-(footprint "JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM07B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 12548da6-d50e-4248-9b0b-275f8e7facd6)
   )
-  (fp_text value "JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 73dd4b06-5557-4dff-aa8d-9678e0b33c02)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -4.5 1) (end 4.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.61 -0.04) (end -4.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.61 1.11) (end -3.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.56 1.11) (end -3.56 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 -0.04) (end 4.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 1.11) (end 3.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.44 -2.01) (end 3.44 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.5 -1.9) (end 4.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 1) (end -4.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.5 1) (end 4.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -1.55) (end -3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -0.95) (end -2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -0.95) (end -2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -1.55) (end -3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -1.55) (end -2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -0.95) (end -1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -0.95) (end -1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.55) (end -2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -1.55) (end -1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -0.95) (end -0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -0.95) (end -0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -1.55) (end -1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -1.55) (end -0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -0.95) (end 0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -0.95) (end 0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -1.55) (end -0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -1.55) (end 0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -0.95) (end 1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -0.95) (end 1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -1.55) (end 0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.55) (end 1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -0.95) (end 2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -0.95) (end 2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -1.55) (end 1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -1.55) (end 2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -0.95) (end 3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -0.95) (end 3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -1.55) (end 2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.4 -2.6) (end -5.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.4 2.6) (end 5.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.4 2.6) (end 5.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.4 -2.6) (end -5.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 1) (end -3 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 0.292893) (end -2.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 669706e8-e3d8-4c0b-a903-15a6e76760cc)
   )
-  (fp_line (start 4.61 -0.04) (end 4.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 0fb9f4ba-4a88-4b62-816b-4497e27bdd36))
-  (fp_line (start -3.56 1.11) (end -3.56 2.1) (layer "F.SilkS") (width 0.12) (tstamp 115e75f5-38df-446b-8700-242eb9d6ab94))
-  (fp_line (start 4.61 1.11) (end 3.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 1769a505-a948-421a-9211-f9ceb648f443))
-  (fp_line (start -3.44 -2.01) (end 3.44 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 7d48b114-6330-4b08-a614-54e4a9fa930d))
-  (fp_line (start -4.61 -0.04) (end -4.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp b288ce42-1af2-4e09-b745-41c7164135fb))
-  (fp_line (start -4.61 1.11) (end -3.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp e6af59a0-4c49-4473-a60c-2c2432bd52e0))
-  (fp_line (start 5.4 2.6) (end 5.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 0a21415d-487c-495a-a696-7537eea61db7))
-  (fp_line (start -5.4 -2.6) (end -5.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 3ba30c8e-ef77-44df-850c-c581e76b53aa))
-  (fp_line (start 5.4 -2.6) (end -5.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 751670d8-5303-43f2-968d-065e643c26d7))
-  (fp_line (start -5.4 2.6) (end 5.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp d8dda8ce-f326-4f42-897e-3e601323a275))
-  (fp_line (start -3.15 -1.55) (end -3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1255d790-660e-4f3b-8a21-5d33ea708a6b))
-  (fp_line (start -2.15 -0.95) (end -1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 14f0fa98-19e0-422c-805d-f34ec866fa1f))
-  (fp_line (start -0.15 -0.95) (end 0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 175597be-aaaa-4938-823f-e3f718d399ed))
-  (fp_line (start -1.15 -0.95) (end -0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 24c186d0-b160-4fc3-8fac-ffe278341297))
-  (fp_line (start 2.85 -0.95) (end 3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 3714e732-10df-4d72-b685-2fcf58b24de2))
-  (fp_line (start -0.85 -0.95) (end -0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 40f95b8d-ded6-47c6-ad52-4e6c89e4675c))
-  (fp_line (start -1.85 -1.55) (end -2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 42e673c3-213d-488a-a2cc-74825862c564))
-  (fp_line (start 1.85 -1.55) (end 1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 42f6e120-ea2e-44c5-b02c-1356c307ba16))
-  (fp_line (start -1.15 -1.55) (end -1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 43a1cc0a-7031-4275-8441-9c8c673d1b92))
-  (fp_line (start -3 0.292893) (end -2.5 1) (layer "F.Fab") (width 0.1) (tstamp 450692b6-4937-42f5-8054-f41defb68427))
-  (fp_line (start -2.85 -1.55) (end -3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4a1859b6-29e3-452d-a933-6d20b8ac5688))
-  (fp_line (start 0.85 -1.55) (end 0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 645aebd7-477b-4489-aac8-632f67ab9bc1))
-  (fp_line (start 1.85 -0.95) (end 2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 66b60f92-8796-4b46-b87e-d270bd372192))
-  (fp_line (start 0.85 -0.95) (end 1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8153c2b8-daf8-4bc4-9fac-3511aafcd232))
-  (fp_line (start 1.15 -1.55) (end 0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 83691ed6-cc3f-4f8d-9c1d-a388b264246d))
-  (fp_line (start -2.15 -1.55) (end -2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 974e0c44-4152-4593-bb27-d858106f614e))
-  (fp_line (start -4.5 1) (end -4.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp aa1dd53d-ef89-4eda-b526-f701181c7af7))
-  (fp_line (start -3.5 1) (end -3 0.292893) (layer "F.Fab") (width 0.1) (tstamp ae65d3d2-ff2f-46c2-8209-bf6aaae2bdb9))
-  (fp_line (start 2.15 -1.55) (end 1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp b207fc42-dcea-4cc1-8e64-49eb1af59a00))
-  (fp_line (start 2.85 -1.55) (end 2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp b82433d1-2278-46e9-aa4f-fa7f59e9dc38))
-  (fp_line (start 1.15 -0.95) (end 1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp c136963b-1d81-43a7-81a6-53146a8fb053))
-  (fp_line (start -0.85 -1.55) (end -1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp c54b11d7-125c-494f-b275-b33ae779baa9))
-  (fp_line (start -3.15 -0.95) (end -2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp c6b11c35-edbe-415e-8138-913f256cb183))
-  (fp_line (start 0.15 -0.95) (end 0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp ccc9a850-bc0a-4547-b667-1672c31cd55a))
-  (fp_line (start 4.5 1) (end 4.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp ccff41d2-6083-424f-809d-ca679dd61970))
-  (fp_line (start -2.85 -0.95) (end -2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp cf1156de-1303-412a-9708-67909efcb222))
-  (fp_line (start -1.85 -0.95) (end -1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp d5143215-bc29-4337-a9d5-6208c10da84f))
-  (fp_line (start -4.5 -1.9) (end 4.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp d53a6ce2-e727-46f3-bfa8-3d909be8c9c3))
-  (fp_line (start -4.5 1) (end 4.5 1) (layer "F.Fab") (width 0.1) (tstamp d5aa4cd8-7ef1-4021-a4c6-00b183dd3f6a))
-  (fp_line (start 3.15 -0.95) (end 3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp e89e0640-53e9-4f6a-b89c-765925911b02))
-  (fp_line (start 0.15 -1.55) (end -0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp f2d98857-d50b-4b99-8597-6489145f9869))
-  (fp_line (start 3.15 -1.55) (end 2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp f4727d14-85d9-4eb3-82d2-9cebf14c3167))
-  (fp_line (start 2.15 -0.95) (end 2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp fd59fec7-7832-436c-8c5f-c24ff8fb059f))
-  (fp_line (start -0.15 -1.55) (end -0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp fefede87-b7c9-4c0c-a4da-05810818d209))
-  (pad "1" smd roundrect (at -3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4ef80fde-284e-4960-9ab3-73afcf6d47d2))
-  (pad "2" smd roundrect (at -2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 997708fb-4707-48df-af97-5861b2ae0331))
-  (pad "3" smd roundrect (at -1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cb607c00-aefa-4a9f-9981-a8460be30ff8))
-  (pad "4" smd roundrect (at 0 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 85c907d4-ad66-4bd2-9f25-b540e22217fe))
-  (pad "5" smd roundrect (at 1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99c8b971-77c0-4314-bc8e-f55638dc1542))
-  (pad "6" smd roundrect (at 2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6da242af-9054-400d-9e32-b4a9cc476c06))
-  (pad "7" smd roundrect (at 3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0d728ebb-ecde-422f-8a6b-8fe1abf447d9))
-  (pad "MP" smd roundrect (at 4.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 100c04c5-26ba-4133-a1a4-a5e94acfb33e))
-  (pad "MP" smd roundrect (at -4.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp a39ac87e-5cc8-4ad8-a8ac-010200268461))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM07B-SRSS-TB_1x07-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical.kicad_mod
index c82f501bb..6329f9466 100644
--- a/Connector_JST.pretty/JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,80 +1,124 @@
-(footprint "JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM08B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7480b5ad-55bb-4a4a-8102-916b7482c324)
   )
-  (fp_text value "JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0a4e3e4a-7d8a-4154-a91c-b260e1320183)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -5 1) (end 5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.11 -0.04) (end -5.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.11 1.11) (end -4.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.06 1.11) (end -4.06 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.11 -0.04) (end 5.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.11 1.11) (end 4.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.94 -2.01) (end 3.94 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5 -1.9) (end 5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 1) (end -5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 1) (end 5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -1.55) (end -3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -0.95) (end -3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -0.95) (end -3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -1.55) (end -3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -1.55) (end -2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -0.95) (end -2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -0.95) (end -2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -1.55) (end -2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -1.55) (end -1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -0.95) (end -1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -0.95) (end -1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -1.55) (end -1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -1.55) (end -0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -0.95) (end -0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -0.95) (end -0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -1.55) (end -0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -1.55) (end 0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -0.95) (end 0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -0.95) (end 0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -1.55) (end 0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -1.55) (end 1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -0.95) (end 1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -0.95) (end 1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -1.55) (end 1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -1.55) (end 2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -0.95) (end 2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -0.95) (end 2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -1.55) (end 2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -1.55) (end 3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -0.95) (end 3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -0.95) (end 3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -1.55) (end 3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.9 -2.6) (end -5.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.9 2.6) (end 5.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.9 2.6) (end 5.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.9 -2.6) (end -5.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4 1) (end -3.5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0.292893) (end -3 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cf711bb7-2f90-455a-b068-f4e23c16c71a)
   )
-  (fp_line (start -4.06 1.11) (end -4.06 2.1) (layer "F.SilkS") (width 0.12) (tstamp 14df8498-0129-404a-a793-00b36a0ab313))
-  (fp_line (start 5.11 -0.04) (end 5.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 1735d33e-fcde-49f2-ad2c-c04ed452cf0c))
-  (fp_line (start -5.11 -0.04) (end -5.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 2d3e4acb-c769-4851-83cb-7748e9cdb652))
-  (fp_line (start 5.11 1.11) (end 4.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 685bcf90-f551-4609-9b05-96a522bd09c0))
-  (fp_line (start -5.11 1.11) (end -4.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp b9912f05-a72d-4e32-8725-5d0646670591))
-  (fp_line (start -3.94 -2.01) (end 3.94 -2.01) (layer "F.SilkS") (width 0.12) (tstamp ee2b0490-4a63-4491-88dc-a5f5b7172a21))
-  (fp_line (start 5.9 -2.6) (end -5.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 2c8158b6-78ef-4314-bdd9-f4694c3448b7))
-  (fp_line (start 5.9 2.6) (end 5.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 433759f4-4d1c-404b-a33a-29cfc36c830a))
-  (fp_line (start -5.9 -2.6) (end -5.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 49d13978-ed63-45ed-824c-9b0fffade87b))
-  (fp_line (start -5.9 2.6) (end 5.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp a38c34bf-2e4f-425f-8f8e-f0e67c948574))
-  (fp_line (start -3.35 -1.55) (end -3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 00a75a89-ffa6-48f7-b596-de63f357aeb0))
-  (fp_line (start -3.65 -0.95) (end -3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 03a5f435-13e6-4624-8b27-6c7062580062))
-  (fp_line (start -1.65 -0.95) (end -1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 06d4cc2e-0f42-4064-9178-185d4df33f58))
-  (fp_line (start 3.65 -0.95) (end 3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 0ab360cd-62a6-4030-ae14-1fde62353d8a))
-  (fp_line (start -0.65 -0.95) (end -0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1cfddbe2-8a87-45fc-b215-ed266afc8414))
-  (fp_line (start -2.35 -1.55) (end -2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 2371b9e2-2698-49db-bfba-a4f2bfa06aa1))
-  (fp_line (start 1.35 -0.95) (end 1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 2c164531-4fa3-4541-97f4-53d8b4bb7c65))
-  (fp_line (start -2.65 -0.95) (end -2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 3d03ece4-c286-43a8-8521-c29b71b25851))
-  (fp_line (start -0.65 -1.55) (end -0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 41e7a457-6257-424a-bbae-47c0222c30ca))
-  (fp_line (start -5 1) (end 5 1) (layer "F.Fab") (width 0.1) (tstamp 4463e66f-2ec4-4213-b95f-c388ebe53829))
-  (fp_line (start 0.35 -1.55) (end 0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 488bade6-cdc7-4e0d-bfd9-2cac4a738b02))
-  (fp_line (start -5 1) (end -5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 4a488600-11ff-45fa-8d33-5cb7911827f0))
-  (fp_line (start 3.65 -1.55) (end 3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4a926857-7c74-405a-b22f-27413841b27a))
-  (fp_line (start -1.65 -1.55) (end -1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 4b863967-fd8f-4135-8429-00776f646e7a))
-  (fp_line (start -1.35 -1.55) (end -1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 53c70e13-3213-4c5b-9222-011d7dd2d53d))
-  (fp_line (start -0.35 -1.55) (end -0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 53f82c55-ebea-4fea-876d-1c3e90b976ae))
-  (fp_line (start 5 1) (end 5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 548ed3e8-b97a-40d6-b11f-3ae526f23f37))
-  (fp_line (start -3.35 -0.95) (end -3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 55ac2516-76cc-46c6-8108-1e5be0f472e7))
-  (fp_line (start -3.65 -1.55) (end -3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 5f7640b5-441e-4acb-849f-9251519cd10a))
-  (fp_line (start 1.35 -1.55) (end 1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6dcf1798-4c36-4dde-8f56-71ee5e9575e3))
-  (fp_line (start 1.65 -1.55) (end 1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 7b2d80ca-7bc6-47bd-ab34-ac69268682ee))
-  (fp_line (start -2.35 -0.95) (end -2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 7bfc0c4f-933f-4079-905e-99f3535e3f5d))
-  (fp_line (start 3.35 -0.95) (end 3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8a2a4cd7-0131-42ed-862f-5a8f4ecaa2f3))
-  (fp_line (start 1.65 -0.95) (end 1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 9b41b20f-1e18-475b-a70b-3c5dfb9afbe4))
-  (fp_line (start 0.65 -1.55) (end 0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp a331dbd0-735f-4354-9ae7-5a3737cd128e))
-  (fp_line (start -5 -1.9) (end 5 -1.9) (layer "F.Fab") (width 0.1) (tstamp a3338810-4f90-4647-a28c-1370d23cdda3))
-  (fp_line (start -3.5 0.292893) (end -3 1) (layer "F.Fab") (width 0.1) (tstamp a520c01a-c295-4d82-8cae-2e78cfcc3cbd))
-  (fp_line (start 2.65 -0.95) (end 2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp ab2d4a00-8348-4920-b295-3b6c516a3f1c))
-  (fp_line (start 2.35 -1.55) (end 2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp b5180c92-d300-466f-aa39-e65d58427247))
-  (fp_line (start 3.35 -1.55) (end 3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp b791a775-e8f1-4b0c-863e-54af1eaf5a55))
-  (fp_line (start 0.35 -0.95) (end 0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp b82d3494-6062-4d7a-bb0e-69d78d291974))
-  (fp_line (start 2.65 -1.55) (end 2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp c3c94591-c781-46a4-8537-d4a0f231bdb2))
-  (fp_line (start -2.65 -1.55) (end -2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp d40aa152-1b11-4405-926a-0d210ee04afb))
-  (fp_line (start 2.35 -0.95) (end 2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp d430d978-6b55-40d4-a67f-c7849d1f47d1))
-  (fp_line (start 0.65 -0.95) (end 0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp db6577fd-af82-4a55-abbd-d557348d7c55))
-  (fp_line (start -1.35 -0.95) (end -1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp e5dab52d-97c2-48dc-96dd-ac1cfb2dc74d))
-  (fp_line (start -4 1) (end -3.5 0.292893) (layer "F.Fab") (width 0.1) (tstamp e7583df2-61e6-4e35-a257-08c37edb1033))
-  (fp_line (start -0.35 -0.95) (end -0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp eb5dc602-1d9a-4168-919f-abcfa89c4ae1))
-  (pad "1" smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 15e3024d-b6e8-40e1-bf90-fa947fa64d3f))
-  (pad "2" smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 30559c60-1cc2-49fa-9c59-3f9798d1e350))
-  (pad "3" smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ceabddb8-af25-485a-ad6d-a93138673447))
-  (pad "4" smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 573385e9-b1d1-4cc1-ae63-f7dae42124cf))
-  (pad "5" smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8136dd44-08ae-43d2-b565-9130f79fc66a))
-  (pad "6" smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 95266134-78f8-407a-8edc-23588b8a7533))
-  (pad "7" smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0903049d-bfa9-4b22-954d-33451467a7dc))
-  (pad "8" smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c5f0a922-581f-4f6e-9bde-0cb4e0b3bfef))
-  (pad "MP" smd roundrect (at 4.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 30003a53-4436-4410-b6a1-d8dffbf73476))
-  (pad "MP" smd roundrect (at -4.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp cfc6fd7b-69cc-473d-bf92-09c59f248dba))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM08B-SRSS-TB_1x08-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical.kicad_mod
index 2a6e0eb64..e45385fbd 100644
--- a/Connector_JST.pretty/JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,85 +1,133 @@
-(footprint "JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM09B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 45e66d14-76b5-4368-9ec0-b5f7f4f060a8)
   )
-  (fp_text value "JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e992e171-110a-49ab-abad-0fe6607f1fa2)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -5.5 1) (end 5.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.61 -0.04) (end -5.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.61 1.11) (end -4.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.56 1.11) (end -4.56 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.61 -0.04) (end 5.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.61 1.11) (end 4.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.44 -2.01) (end 4.44 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.5 -1.9) (end 5.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 1) (end -5.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 1) (end 5.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -1.55) (end -4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -0.95) (end -3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -0.95) (end -3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -1.55) (end -4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -1.55) (end -3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -0.95) (end -2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -0.95) (end -2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -1.55) (end -3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -1.55) (end -2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -0.95) (end -1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -0.95) (end -1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.55) (end -2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -1.55) (end -1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -0.95) (end -0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -0.95) (end -0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -1.55) (end -1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -1.55) (end -0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -0.95) (end 0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -0.95) (end 0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -1.55) (end -0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -1.55) (end 0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -0.95) (end 1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -0.95) (end 1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -1.55) (end 0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.55) (end 1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -0.95) (end 2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -0.95) (end 2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -1.55) (end 1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -1.55) (end 2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -0.95) (end 3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -0.95) (end 3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -1.55) (end 2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -1.55) (end 3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -0.95) (end 4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -0.95) (end 4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -1.55) (end 3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.4 -2.6) (end -6.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.4 2.6) (end 6.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.4 2.6) (end 6.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.4 -2.6) (end -6.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.5 1) (end -4 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0.292893) (end -3.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 5.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 71444855-eddb-4c09-979b-a27a5143ca85)
   )
-  (fp_line (start 5.61 -0.04) (end 5.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 0022dfaf-81c6-4d98-882e-7857d6cf908e))
-  (fp_line (start -4.44 -2.01) (end 4.44 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 5fbaa933-f8cd-412e-9778-0f39553d943e))
-  (fp_line (start -5.61 1.11) (end -4.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 71aaf06a-ae44-4f5c-a937-e5092ddbde95))
-  (fp_line (start -5.61 -0.04) (end -5.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 9f975bc0-516e-41f4-90dc-f68d23d5ed14))
-  (fp_line (start -4.56 1.11) (end -4.56 2.1) (layer "F.SilkS") (width 0.12) (tstamp b0b63502-3519-4a8d-8a20-92317ae14e71))
-  (fp_line (start 5.61 1.11) (end 4.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp d33a498f-c194-4679-89c2-89c881ced67d))
-  (fp_line (start -6.4 2.6) (end 6.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 21cb4acf-957c-4de4-bd83-dbef90bdf880))
-  (fp_line (start 6.4 2.6) (end 6.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 43d5ea39-6724-4151-a840-2d6d7cc9269d))
-  (fp_line (start 6.4 -2.6) (end -6.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 8dc16eb6-d09e-412f-8f5e-43f78cbac720))
-  (fp_line (start -6.4 -2.6) (end -6.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp e1ccb2da-96cd-4bd3-abd7-df5736a3b818))
-  (fp_line (start -1.85 -1.55) (end -2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 03153621-35cf-4b51-8c1f-f01bd82e911c))
-  (fp_line (start 5.5 1) (end 5.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 05060fcf-0f0b-4f2f-abdd-99e4a3c3135c))
-  (fp_line (start -0.15 -1.55) (end -0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 07e2da5d-5398-497a-aa2e-50d4c4a55fb2))
-  (fp_line (start -1.85 -0.95) (end -1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 17dec758-bb51-40ca-93f6-e3eeec805fdd))
-  (fp_line (start 2.85 -1.55) (end 2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 183e9a7e-ab6d-4af3-8ed5-e46ece164d7d))
-  (fp_line (start 4.15 -0.95) (end 4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 2946fa2a-c47a-4221-bedd-fc80231e43bf))
-  (fp_line (start -4.15 -0.95) (end -3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 2c2dedca-bbdc-45fe-9a15-7cc7745018f7))
-  (fp_line (start -3.15 -0.95) (end -2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 38f90ac3-7511-4469-a98b-6719869d84ff))
-  (fp_line (start -2.85 -0.95) (end -2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 42098400-1398-4634-ab25-f1d83f7940a4))
-  (fp_line (start -2.15 -0.95) (end -1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 44b7a25b-80fb-4b6f-bd75-fdd5d7eb150d))
-  (fp_line (start 3.85 -1.55) (end 3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 492126e8-6a7c-4b7a-a4e2-5f0dea0dc16b))
-  (fp_line (start -5.5 -1.9) (end 5.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 51a6d458-0823-44de-a1a0-c280444bded4))
-  (fp_line (start -4.15 -1.55) (end -4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 54ce6d7b-a8e8-4412-a2dc-9b3741056a2f))
-  (fp_line (start -2.85 -1.55) (end -3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 58ef0ceb-edbb-4cb3-a678-d9433eb3ca0a))
-  (fp_line (start -0.85 -0.95) (end -0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 5b3fdf7c-e1a2-4bc9-9c86-d8dd7cc6334c))
-  (fp_line (start 0.15 -1.55) (end -0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 5bc2f56d-3bd0-46a0-b3a9-a950d76080ee))
-  (fp_line (start -3.85 -1.55) (end -4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 68842312-ad1a-4665-92fd-ce737d940efe))
-  (fp_line (start 3.15 -1.55) (end 2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6f510839-b5a9-4601-bda6-d5ffc4f87752))
-  (fp_line (start -1.15 -0.95) (end -0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 7af399cf-4ce7-4b74-85f1-657ab29f0987))
-  (fp_line (start 4.15 -1.55) (end 3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 83e88631-197e-4610-be2e-595bf7b5147b))
-  (fp_line (start -5.5 1) (end -5.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 870a28ae-48c0-4597-813c-1b176d21414d))
-  (fp_line (start -3.15 -1.55) (end -3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 89d142cc-d363-42e4-9ae8-b03ffc2c2a52))
-  (fp_line (start -5.5 1) (end 5.5 1) (layer "F.Fab") (width 0.1) (tstamp 92302edf-c648-49f7-8a6c-4ec92e77cae3))
-  (fp_line (start -0.85 -1.55) (end -1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp a6471d3b-caf7-4d18-9a43-36aabeddf870))
-  (fp_line (start -1.15 -1.55) (end -1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp a8d81ab7-a90e-43a7-8192-12e53e75f9b5))
-  (fp_line (start 2.15 -1.55) (end 1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp a9ecd3f0-9d4b-41db-b387-0601ee29e267))
-  (fp_line (start -3.85 -0.95) (end -3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp adbe521d-e1e5-4df4-be90-5ca9c1023aa1))
-  (fp_line (start 1.85 -1.55) (end 1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp b35e6296-eddf-4576-9d7d-bdc52998e99e))
-  (fp_line (start -4.5 1) (end -4 0.292893) (layer "F.Fab") (width 0.1) (tstamp b545afbe-a955-4363-b64b-41ae72230e7c))
-  (fp_line (start 2.85 -0.95) (end 3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp b5db740a-98ed-447d-9e7c-6e6c550f29f6))
-  (fp_line (start 1.85 -0.95) (end 2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp b879e882-4578-4eb1-ad40-e861a00f1163))
-  (fp_line (start 0.15 -0.95) (end 0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp b95281f9-1428-4d29-b379-0fff36c9e5ef))
-  (fp_line (start 3.85 -0.95) (end 4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp c35017dd-07d3-408e-86e9-61685dbd5047))
-  (fp_line (start 1.15 -0.95) (end 1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp c74ce6bf-5c24-4228-9f41-3a4d1cc79d55))
-  (fp_line (start 0.85 -0.95) (end 1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp d2003a71-f4ac-433d-b8b8-edff4b8c1a27))
-  (fp_line (start 3.15 -0.95) (end 3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp d5398275-93ab-42c4-a8f8-930d2b289715))
-  (fp_line (start -0.15 -0.95) (end 0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp d715a6db-ec73-46da-94da-6dd1c13c99b5))
-  (fp_line (start 2.15 -0.95) (end 2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp de398bd6-a4e9-4a7e-aa9a-761d0bd782f0))
-  (fp_line (start 1.15 -1.55) (end 0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp decca3b2-4345-48e6-aed6-11415287615d))
-  (fp_line (start 0.85 -1.55) (end 0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp e8b0db81-49b2-4cf8-93f8-7c20dbfc6332))
-  (fp_line (start -4 0.292893) (end -3.5 1) (layer "F.Fab") (width 0.1) (tstamp ed97eeea-4e51-460e-9446-5c98e65e2d3a))
-  (fp_line (start -2.15 -1.55) (end -2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp fb0f7574-51af-4e93-bb61-890df121ef37))
-  (pad "1" smd roundrect (at -4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ad829e65-a7ab-48de-b402-040ec1d3b3d7))
-  (pad "2" smd roundrect (at -3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 118f4e7f-8106-458e-9354-db923e1e6cf6))
-  (pad "3" smd roundrect (at -2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e78b56ba-fd74-4802-bba3-8b363977b3c1))
-  (pad "4" smd roundrect (at -1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 529e35e7-d664-464e-944d-a10fb958aa8c))
-  (pad "5" smd roundrect (at 0 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4274c6ce-f64c-4bb7-a57f-ade11d14e40f))
-  (pad "6" smd roundrect (at 1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 98fb5af0-ce49-4ae0-8404-9ad6db2b258a))
-  (pad "7" smd roundrect (at 2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a15f260e-5221-4657-bf2c-812ab70f74aa))
-  (pad "8" smd roundrect (at 3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 38144d14-b42f-4818-baa4-4535adf17ab1))
-  (pad "9" smd roundrect (at 4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8fee236b-7b2f-4b98-b319-a519526d0c1f))
-  (pad "MP" smd roundrect (at 5.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 90fa0ad4-7e25-4e98-b34c-706f627deedc))
-  (pad "MP" smd roundrect (at -5.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp e59340f5-4cab-4d8b-b601-81c193991619))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM09B-SRSS-TB_1x09-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical.kicad_mod
index 67d01933d..25e22aa18 100644
--- a/Connector_JST.pretty/JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,90 +1,142 @@
-(footprint "JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM10B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3509ff50-a5e5-4a24-baff-cd883fb953b9)
   )
-  (fp_text value "JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 39938002-0055-4592-bb93-678bfec7a988)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -6 1) (end 6 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.11 -0.04) (end -6.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 1.11) (end -5.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.06 1.11) (end -5.06 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 -0.04) (end 6.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 1.11) (end 5.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.94 -2.01) (end 4.94 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6 -1.9) (end 6 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 1) (end -6 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 1) (end 6 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.65 -1.55) (end -4.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.65 -0.95) (end -4.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.35 -0.95) (end -4.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.35 -1.55) (end -4.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -1.55) (end -3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -0.95) (end -3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -0.95) (end -3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -1.55) (end -3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -1.55) (end -2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -0.95) (end -2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -0.95) (end -2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -1.55) (end -2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -1.55) (end -1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -0.95) (end -1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -0.95) (end -1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -1.55) (end -1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -1.55) (end -0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -0.95) (end -0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -0.95) (end -0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -1.55) (end -0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -1.55) (end 0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -0.95) (end 0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -0.95) (end 0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -1.55) (end 0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -1.55) (end 1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -0.95) (end 1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -0.95) (end 1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -1.55) (end 1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -1.55) (end 2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -0.95) (end 2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -0.95) (end 2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -1.55) (end 2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -1.55) (end 3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -0.95) (end 3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -0.95) (end 3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -1.55) (end 3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.35 -1.55) (end 4.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.35 -0.95) (end 4.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.65 -0.95) (end 4.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.65 -1.55) (end 4.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.9 -2.6) (end -6.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.9 2.6) (end 6.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.9 2.6) (end 6.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.9 -2.6) (end -6.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5 1) (end -4.5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 0.292893) (end -4 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 5.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9bbaf2ff-9959-4f47-a494-c43e3146d4b8)
   )
-  (fp_line (start -5.06 1.11) (end -5.06 2.1) (layer "F.SilkS") (width 0.12) (tstamp 43ca018f-81cd-44fe-8d5f-c125451c9a28))
-  (fp_line (start -4.94 -2.01) (end 4.94 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 574c9c4f-23cb-4b51-9568-d5d60741ef5f))
-  (fp_line (start 6.11 -0.04) (end 6.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 7e067113-94e8-4b43-b1e7-300fa1d81ba1))
-  (fp_line (start 6.11 1.11) (end 5.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 9ab222de-a74d-4e56-a505-bb65bb2c3390))
-  (fp_line (start -6.11 1.11) (end -5.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp b1457551-0b51-42c0-b9a8-63cebb35ee39))
-  (fp_line (start -6.11 -0.04) (end -6.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp cf469868-8899-4ee3-85fd-444fdce4428b))
-  (fp_line (start -6.9 2.6) (end 6.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 55f1db6e-29e1-4fd9-aae9-6c0ab7010bc8))
-  (fp_line (start 6.9 2.6) (end 6.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp cc708353-4696-4edd-b2b6-b463ed0182cb))
-  (fp_line (start 6.9 -2.6) (end -6.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp e3b8e007-a36f-49ad-80e7-9c2110870194))
-  (fp_line (start -6.9 -2.6) (end -6.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp ea055584-7293-483c-aa8e-8007dd6960cd))
-  (fp_line (start 3.65 -0.95) (end 3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 020d3fd7-4c75-4be1-b9a3-480275e3f786))
-  (fp_line (start 4.35 -0.95) (end 4.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0b088594-654a-485f-a0a6-b0ccf4e80eaf))
-  (fp_line (start -0.65 -0.95) (end -0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0c502993-5e8c-4e82-9b9d-e211a156882f))
-  (fp_line (start -1.65 -0.95) (end -1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0fb99efb-01f5-4140-8591-f42e00943fd1))
-  (fp_line (start -2.35 -0.95) (end -2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 17ccced8-1949-44b8-9063-1ffd5a688f58))
-  (fp_line (start 0.65 -0.95) (end 0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 268b7125-3303-44b9-b77a-268d3b2aea09))
-  (fp_line (start -1.35 -1.55) (end -1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 2fb64e16-326a-4ac8-bf03-3258c2cb6866))
-  (fp_line (start 0.35 -0.95) (end 0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 327c23a2-26bc-4692-aa07-88b7fa2527c6))
-  (fp_line (start -3.65 -1.55) (end -3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 3b5bcb68-54fd-4eb1-9372-b0cae56ea91b))
-  (fp_line (start 2.35 -0.95) (end 2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 3ec0061c-3fda-4683-be37-8246b3da2548))
-  (fp_line (start 3.65 -1.55) (end 3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 42caead9-a5eb-42a4-ba44-04bb77bd96f6))
-  (fp_line (start 1.65 -1.55) (end 1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4d2feccd-02ab-4e4d-b4b4-907ed81ddaad))
-  (fp_line (start -4.65 -1.55) (end -4.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 5144aa57-0067-424b-a282-1aabba8ed7d6))
-  (fp_line (start -4.35 -1.55) (end -4.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 576186bd-4ca9-438a-aaf3-3fc1c5a52851))
-  (fp_line (start -6 -1.9) (end 6 -1.9) (layer "F.Fab") (width 0.1) (tstamp 57eb2af3-e6fa-4c81-a16a-768dbba52806))
-  (fp_line (start -1.65 -1.55) (end -1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 58705c49-7252-4091-89da-0477de22b303))
-  (fp_line (start 1.65 -0.95) (end 1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 60681ffe-5b84-4e91-9c9c-ca59eb92345d))
-  (fp_line (start -4.65 -0.95) (end -4.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 66d33d9c-a794-447b-8bcd-ca7e6c23eb67))
-  (fp_line (start 3.35 -1.55) (end 3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6752b014-cd72-4d03-809d-fb7958f4c5d9))
-  (fp_line (start -3.35 -0.95) (end -3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 67ad3c5f-e2b5-436a-9d46-fcc871747640))
-  (fp_line (start -0.35 -1.55) (end -0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6b44accd-24fe-49df-842e-461bf51c0751))
-  (fp_line (start 1.35 -0.95) (end 1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6dc0c929-39d5-434c-99eb-7bad684314c6))
-  (fp_line (start -3.65 -0.95) (end -3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 76b86fd1-28e7-4a95-8669-9b679bc30203))
-  (fp_line (start -6 1) (end 6 1) (layer "F.Fab") (width 0.1) (tstamp 7bd1ac60-5a56-4d5a-b035-2fc2ac936b3a))
-  (fp_line (start 2.65 -1.55) (end 2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 8d5cebfa-d313-46db-ac69-99a6315b3d64))
-  (fp_line (start -0.35 -0.95) (end -0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 92c27a63-66d2-4576-9204-3ec902877646))
-  (fp_line (start -6 1) (end -6 -1.9) (layer "F.Fab") (width 0.1) (tstamp 966124a0-93c6-48ac-b85a-6704a0e100ee))
-  (fp_line (start 0.35 -1.55) (end 0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9ca09ec0-e04c-42f8-8eec-575ff658a823))
-  (fp_line (start 0.65 -1.55) (end 0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp a214cfa7-3adf-49e8-ab4a-53d73b345897))
-  (fp_line (start -3.35 -1.55) (end -3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp a5eb2954-7b73-4100-a7f7-413ead409f45))
-  (fp_line (start 4.65 -1.55) (end 4.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp a913f834-3937-4733-93cc-b4145e01faa0))
-  (fp_line (start -2.35 -1.55) (end -2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp ada5dd73-582d-4d3e-95af-218d3ff57b02))
-  (fp_line (start 3.35 -0.95) (end 3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp b0b204e3-5b5c-4b1c-b456-d37e04900d15))
-  (fp_line (start -2.65 -0.95) (end -2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp bb4fabd9-7941-4267-a2eb-bdd3d0901258))
-  (fp_line (start 2.65 -0.95) (end 2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp c860b85c-4945-43f8-8281-139def2dda5f))
-  (fp_line (start -1.35 -0.95) (end -1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp cf58e394-eadf-4b51-ae9f-44014d0f3a6f))
-  (fp_line (start 6 1) (end 6 -1.9) (layer "F.Fab") (width 0.1) (tstamp cfcdc119-37c1-4ecb-aaa1-6f1551fbb739))
-  (fp_line (start -0.65 -1.55) (end -0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp d446cede-1f4e-4aba-8c8a-d2bee401062c))
-  (fp_line (start 1.35 -1.55) (end 1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp da410231-78b1-4304-9fb4-74b5401c9483))
-  (fp_line (start 4.35 -1.55) (end 4.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp db5cb0cd-38d9-4c60-857d-6d3f7e7f8cff))
-  (fp_line (start 4.65 -0.95) (end 4.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp e316c00a-276c-4822-85f9-58206ebe3e61))
-  (fp_line (start -4.5 0.292893) (end -4 1) (layer "F.Fab") (width 0.1) (tstamp eebc7ff9-8912-4846-a003-344b1ac9b814))
-  (fp_line (start -2.65 -1.55) (end -2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp eee436c3-dc99-484c-85ed-4f182f9fd555))
-  (fp_line (start -4.35 -0.95) (end -4.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp f28abe22-52d0-4f15-b357-f7e7868b86ce))
-  (fp_line (start 2.35 -1.55) (end 2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp f98f376d-bd7c-4c3c-8cb6-a1f812456fd0))
-  (fp_line (start -5 1) (end -4.5 0.292893) (layer "F.Fab") (width 0.1) (tstamp fe441413-35f9-4381-bb38-58d56c9da376))
-  (pad "1" smd roundrect (at -4.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ec7b5353-8c28-4fd9-8a07-ee502b67f8bf))
-  (pad "2" smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 39e1af40-5ff4-4c1d-9065-f366a2b64289))
-  (pad "3" smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ee3a8631-b588-4b71-8101-9737adf39e0b))
-  (pad "4" smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 077adee6-22d5-4255-a648-dbcad7591ddc))
-  (pad "5" smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c3f5655-3eb3-4543-a00a-9d0516a4e23e))
-  (pad "6" smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0f4fb1a3-ad34-444a-808a-895a7948e16a))
-  (pad "7" smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 37ccd6d8-fa7b-4fcf-bad0-6e4648ad12ab))
-  (pad "8" smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c56dc9aa-8af2-430f-ae34-0061d872102a))
-  (pad "9" smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9674f111-0d42-481e-8308-946ce388929a))
-  (pad "10" smd roundrect (at 4.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 29019956-001b-455e-a10b-f724711d71ca))
-  (pad "MP" smd roundrect (at 5.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 1cae9678-b905-4f9c-b9b5-7a3fcee25f73))
-  (pad "MP" smd roundrect (at -5.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 69f2f0ca-44db-4321-8724-8076f238e0d7))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM10B-SRSS-TB_1x10-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical.kicad_mod
index 0073f1087..4d41456b0 100644
--- a/Connector_JST.pretty/JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,95 +1,151 @@
-(footprint "JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM11B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6e5526f8-5f49-43e7-b723-ca56ac014ce8)
   )
-  (fp_text value "JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 700896a7-b6c8-400b-bbc6-bbb2cfb23ec0)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -6.5 1) (end 6.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.61 -0.04) (end -6.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.61 1.11) (end -5.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.56 1.11) (end -5.56 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.61 -0.04) (end 6.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.61 1.11) (end 5.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.44 -2.01) (end 5.44 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.5 -1.9) (end 6.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 1) (end -6.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 1) (end 6.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -1.55) (end -5.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -0.95) (end -4.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.85 -0.95) (end -4.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.85 -1.55) (end -5.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -1.55) (end -4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -0.95) (end -3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -0.95) (end -3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -1.55) (end -4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -1.55) (end -3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -0.95) (end -2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -0.95) (end -2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -1.55) (end -3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -1.55) (end -2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -0.95) (end -1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -0.95) (end -1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.55) (end -2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -1.55) (end -1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -0.95) (end -0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -0.95) (end -0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -1.55) (end -1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -1.55) (end -0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -0.95) (end 0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -0.95) (end 0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -1.55) (end -0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -1.55) (end 0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -0.95) (end 1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -0.95) (end 1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -1.55) (end 0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.55) (end 1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -0.95) (end 2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -0.95) (end 2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -1.55) (end 1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -1.55) (end 2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -0.95) (end 3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -0.95) (end 3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -1.55) (end 2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -1.55) (end 3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -0.95) (end 4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -0.95) (end 4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -1.55) (end 3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.85 -1.55) (end 4.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.85 -0.95) (end 5.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -0.95) (end 5.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -1.55) (end 4.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.4 -2.6) (end -7.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.4 2.6) (end 7.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.4 2.6) (end 7.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.4 -2.6) (end -7.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 1) (end -5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 0.292893) (end -4.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 21595b55-e6a7-43e4-9cbc-0d2efc17617a)
   )
-  (fp_line (start 6.61 -0.04) (end 6.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 1dbda95f-19f3-49c7-9d67-6ae24d89f2dc))
-  (fp_line (start -6.61 -0.04) (end -6.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 215f0305-741c-4de6-9a85-dccf2063c19c))
-  (fp_line (start 6.61 1.11) (end 5.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 75c6b9ab-f410-47ac-ad1f-5ef5bbf29130))
-  (fp_line (start -6.61 1.11) (end -5.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 77b7c416-4f4d-4dd1-a75a-ab1618bedb00))
-  (fp_line (start -5.44 -2.01) (end 5.44 -2.01) (layer "F.SilkS") (width 0.12) (tstamp a75c9ce4-80c0-4ae4-b81a-95428d9efb2d))
-  (fp_line (start -5.56 1.11) (end -5.56 2.1) (layer "F.SilkS") (width 0.12) (tstamp c8364fd5-af03-4b99-a009-eac8f5cfd190))
-  (fp_line (start -7.4 -2.6) (end -7.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 02919933-190c-48bb-895f-1af3c39a4ed6))
-  (fp_line (start 7.4 -2.6) (end -7.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp b5c7046e-4dff-4593-b83a-3f39a9519b51))
-  (fp_line (start 7.4 2.6) (end 7.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp c6d30ec2-8975-4c1b-a42e-8badc27dc5a0))
-  (fp_line (start -7.4 2.6) (end 7.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp e7d78b2e-7aff-4da8-b8e1-8b37e62f6c7a))
-  (fp_line (start -6.5 -1.9) (end 6.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 052c820e-b875-47b5-b76e-aefc4a2cab9a))
-  (fp_line (start -4.85 -0.95) (end -4.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 07a9e30b-7a65-40b2-8258-14d077bd9839))
-  (fp_line (start 1.85 -0.95) (end 2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0c31b536-c448-4a17-b36a-27fcc0817bf7))
-  (fp_line (start -0.15 -0.95) (end 0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 23707bc9-aeaa-483d-b834-1ec351e85b55))
-  (fp_line (start -3.85 -0.95) (end -3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 2e98c91b-f956-465a-b68e-bfd12610e501))
-  (fp_line (start -4.85 -1.55) (end -5.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 2fcc3d62-7bc8-4834-98ba-0389b96bcaca))
-  (fp_line (start 0.85 -0.95) (end 1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 33809b47-afaa-40d7-9705-4e70f298b39a))
-  (fp_line (start -2.85 -1.55) (end -3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 376e2c90-7917-4ab9-a903-d9545fec29a4))
-  (fp_line (start 3.15 -1.55) (end 2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 39572963-fba5-4189-9ec2-e5b865f49a5c))
-  (fp_line (start 0.15 -0.95) (end 0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3d79c34d-87b0-486f-b9eb-1c1c0ff66b6c))
-  (fp_line (start 1.15 -1.55) (end 0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3fecd747-3776-41bc-bd79-c4efaf14ebeb))
-  (fp_line (start 3.85 -1.55) (end 3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 48282a67-4cfc-4c57-bbae-1bfa6549adb8))
-  (fp_line (start 3.15 -0.95) (end 3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4c17a4b4-9b72-48fb-b7cd-dc169f3cc528))
-  (fp_line (start 2.15 -1.55) (end 1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 58e71c25-4525-4720-be4a-d8fc5360c74f))
-  (fp_line (start -3.85 -1.55) (end -4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 62d43487-6a77-4c4f-91d2-83ca4c1a90b6))
-  (fp_line (start 5.15 -0.95) (end 5.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 664f8150-7877-42d1-b0a0-9419225f5b79))
-  (fp_line (start 5.15 -1.55) (end 4.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 67098d3a-2fd6-45f4-b5cd-fff54db0eda0))
-  (fp_line (start 4.15 -0.95) (end 4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6b1c943b-1ba6-4cb7-a6d9-8f9b6cd94088))
-  (fp_line (start 0.15 -1.55) (end -0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 71e2337e-57e3-48a9-aa9c-eeaf94f734e7))
-  (fp_line (start -0.15 -1.55) (end -0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 71ef833e-396d-442c-a0aa-09138d232c99))
-  (fp_line (start 0.85 -1.55) (end 0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 729c7469-3e0f-4679-a86a-0d78b81ec0f9))
-  (fp_line (start 2.85 -1.55) (end 2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 7396357d-3ea8-4cea-a613-d28373eaf241))
-  (fp_line (start 2.85 -0.95) (end 3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 7a150f1d-7639-49d3-8d62-9bf7844f2546))
-  (fp_line (start -4.15 -1.55) (end -4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 7a3eb15e-969a-443d-a871-af084078befd))
-  (fp_line (start -0.85 -0.95) (end -0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 7efd30b9-9c88-46a4-a523-819c8887f762))
-  (fp_line (start 1.85 -1.55) (end 1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 84bb1090-e600-4bec-998f-81f5e3dd96de))
-  (fp_line (start -2.15 -1.55) (end -2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 881600b9-abdb-4358-b61b-1ce05bda8a5e))
-  (fp_line (start 6.5 1) (end 6.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 8cd920d0-3505-4bf4-8c56-39dbebd1a03c))
-  (fp_line (start -2.15 -0.95) (end -1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8d21f8a6-f408-4b4d-8b4d-9fdb169a180c))
-  (fp_line (start -5 0.292893) (end -4.5 1) (layer "F.Fab") (width 0.1) (tstamp 8ecffc04-1f56-4c2a-8fe6-c819e8c95876))
-  (fp_line (start 3.85 -0.95) (end 4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 92f44e3f-edad-4990-a482-4ca32a79d984))
-  (fp_line (start -3.15 -1.55) (end -3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 92fe5a53-b8dc-48d4-b3cd-9f93bc90b942))
-  (fp_line (start 4.85 -0.95) (end 5.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 952a5ad0-ed69-4b1d-b96f-6202c15f36ad))
-  (fp_line (start -1.85 -0.95) (end -1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 96725871-2d0e-4673-8573-174357f852c2))
-  (fp_line (start -5.5 1) (end -5 0.292893) (layer "F.Fab") (width 0.1) (tstamp a05b64a1-2be0-4257-aef1-cb20687a50d0))
-  (fp_line (start -5.15 -0.95) (end -4.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp a490963c-bad0-4844-9488-161a271e41dc))
-  (fp_line (start -6.5 1) (end 6.5 1) (layer "F.Fab") (width 0.1) (tstamp a82dc123-e9b9-47de-9f3c-1af109bb45f4))
-  (fp_line (start -4.15 -0.95) (end -3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp a910c414-a8e9-44b5-84b9-905767a3897e))
-  (fp_line (start -3.15 -0.95) (end -2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp ab0e978e-bc2a-4e47-b9f0-9bc19cdfd31b))
-  (fp_line (start 2.15 -0.95) (end 2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp b6a093d7-77f3-4445-a4ad-411fb70c1a52))
-  (fp_line (start -2.85 -0.95) (end -2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp bf506a6c-c89e-4ca5-a045-6e89454a7a40))
-  (fp_line (start 4.15 -1.55) (end 3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp c6adb281-44f7-4f17-9997-617a00a9daa5))
-  (fp_line (start -6.5 1) (end -6.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp cdc79c39-b3b8-4918-8311-d602409615d7))
-  (fp_line (start 1.15 -0.95) (end 1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp d7bb6c26-9ad9-4f30-84dd-c0baf2daa8d8))
-  (fp_line (start -0.85 -1.55) (end -1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp d88d012e-502e-40dc-a3fe-e3fb882cbdf1))
-  (fp_line (start -5.15 -1.55) (end -5.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp dc9edfea-01ba-489f-87ee-5fbdeb705c03))
-  (fp_line (start -1.15 -1.55) (end -1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp f03f5b8e-ee72-48f9-9a67-425654f6c539))
-  (fp_line (start 4.85 -1.55) (end 4.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp f0ed768b-0275-4d57-98e3-b3c408a1c381))
-  (fp_line (start -1.85 -1.55) (end -2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp f717bdf6-164a-4f10-98f8-1ca216fc91e2))
-  (fp_line (start -1.15 -0.95) (end -0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp fae96473-f5aa-4830-b34b-4a340f121cc4))
-  (pad "1" smd roundrect (at -5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e772e48d-ca6d-48cf-a92c-6c3580da87a8))
-  (pad "2" smd roundrect (at -4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 26b81fa7-7626-408f-8534-24f6a2427140))
-  (pad "3" smd roundrect (at -3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f6510228-9ada-414e-acda-695e9391e60a))
-  (pad "4" smd roundrect (at -2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ec28e5f4-b4b0-44f5-be25-29a2b874a337))
-  (pad "5" smd roundrect (at -1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b1c7b804-0fb0-499d-9b50-1d1c4b6e5506))
-  (pad "6" smd roundrect (at 0 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6eb1d20a-0385-46ad-95c5-4773d4bd1137))
-  (pad "7" smd roundrect (at 1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f6ad9412-d5e4-46fa-b7ff-5de79f28c8b5))
-  (pad "8" smd roundrect (at 2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3c9aaac2-b561-4a90-9308-553ba8abb4f6))
-  (pad "9" smd roundrect (at 3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fbd83baa-907e-4082-bbcb-5b43fb77f649))
-  (pad "10" smd roundrect (at 4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c28e7b5c-6bec-49c4-b1f6-7bdce20c2c49))
-  (pad "11" smd roundrect (at 5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ca8bfeeb-43e3-4969-a13f-2859b5f6077d))
-  (pad "MP" smd roundrect (at -6.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 7b64c17d-14e0-412a-a557-4e885a5b32d7))
-  (pad "MP" smd roundrect (at 6.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp ae48fb43-5109-40e9-8ab2-bc291d9e567c))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM11B-SRSS-TB_1x11-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical.kicad_mod
index b0dc9a659..a83d108fa 100644
--- a/Connector_JST.pretty/JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,100 +1,160 @@
-(footprint "JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM12B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ca4f97f2-60cf-4d3c-8319-fc4fffd41b78)
   )
-  (fp_text value "JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 267863d2-3aff-47f7-9ca1-b858eab1c367)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -7 1) (end 7 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.11 -0.04) (end -7.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.11 1.11) (end -6.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.06 1.11) (end -6.06 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.11 -0.04) (end 7.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.11 1.11) (end 6.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.94 -2.01) (end 5.94 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7 -1.9) (end 7 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 1) (end -7 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 1) (end 7 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.65 -1.55) (end -5.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.65 -0.95) (end -5.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.35 -0.95) (end -5.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.35 -1.55) (end -5.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.65 -1.55) (end -4.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.65 -0.95) (end -4.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.35 -0.95) (end -4.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.35 -1.55) (end -4.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -1.55) (end -3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -0.95) (end -3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -0.95) (end -3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -1.55) (end -3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -1.55) (end -2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -0.95) (end -2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -0.95) (end -2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -1.55) (end -2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -1.55) (end -1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -0.95) (end -1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -0.95) (end -1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -1.55) (end -1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -1.55) (end -0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -0.95) (end -0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -0.95) (end -0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -1.55) (end -0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -1.55) (end 0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -0.95) (end 0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -0.95) (end 0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -1.55) (end 0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -1.55) (end 1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -0.95) (end 1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -0.95) (end 1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -1.55) (end 1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -1.55) (end 2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -0.95) (end 2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -0.95) (end 2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -1.55) (end 2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -1.55) (end 3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -0.95) (end 3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -0.95) (end 3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -1.55) (end 3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.35 -1.55) (end 4.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.35 -0.95) (end 4.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.65 -0.95) (end 4.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.65 -1.55) (end 4.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.35 -1.55) (end 5.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.35 -0.95) (end 5.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.65 -0.95) (end 5.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.65 -1.55) (end 5.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.9 -2.6) (end -7.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.9 2.6) (end 7.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.9 2.6) (end 7.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.9 -2.6) (end -7.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6 1) (end -5.5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 0.292893) (end -5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8b0ec3c5-08bc-4b49-be5d-9a345b804bba)
   )
-  (fp_line (start -7.11 -0.04) (end -7.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 2ef4368e-11bf-4936-876b-de59381b5556))
-  (fp_line (start 7.11 1.11) (end 6.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 576e359b-874b-4dcd-987b-f1d8f96b44a1))
-  (fp_line (start -7.11 1.11) (end -6.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 6ff8584b-0f78-4bef-97e2-f539a293b0e7))
-  (fp_line (start -5.94 -2.01) (end 5.94 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 8fb3afb4-287f-402e-9cb5-c4ca70f2ac54))
-  (fp_line (start -6.06 1.11) (end -6.06 2.1) (layer "F.SilkS") (width 0.12) (tstamp d5c485e9-ab55-4783-8973-2062c9b2a8c6))
-  (fp_line (start 7.11 -0.04) (end 7.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp e2ec8b26-cc82-4c5c-8f69-db6300c666b2))
-  (fp_line (start -7.9 -2.6) (end -7.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 1c7adf27-07d8-4660-80a6-64844a6d76b4))
-  (fp_line (start 7.9 -2.6) (end -7.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 8576a2aa-45ed-4caa-81d1-aa0c671e4e7a))
-  (fp_line (start 7.9 2.6) (end 7.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp c0397399-f47f-4d2f-a8b4-60785b60856c))
-  (fp_line (start -7.9 2.6) (end 7.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp c230875b-a9bb-4e2b-80bc-ae3c8a2df527))
-  (fp_line (start 4.35 -1.55) (end 4.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 005aef82-8b5c-445f-b057-66eaf99a9b4c))
-  (fp_line (start 4.65 -1.55) (end 4.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 08d09a31-7989-404a-82c5-cca4f1b84bb9))
-  (fp_line (start -5.35 -0.95) (end -5.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 0a7519ba-f1f3-46ad-b863-847ce620c312))
-  (fp_line (start 3.65 -0.95) (end 3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 0ae75c24-b05b-45a2-911d-3bfd33c5ada1))
-  (fp_line (start -4.35 -0.95) (end -4.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 10a5f940-c2a1-42f7-abd1-02684f031f47))
-  (fp_line (start -1.35 -1.55) (end -1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 1564f364-70bf-4238-b87c-a9dce53bd778))
-  (fp_line (start 4.35 -0.95) (end 4.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1b604ae5-7d43-4bd9-958a-786bc06ecd8d))
-  (fp_line (start -5.5 0.292893) (end -5 1) (layer "F.Fab") (width 0.1) (tstamp 1cfc6b83-9661-4b63-a321-c5d4ed32daa0))
-  (fp_line (start -0.35 -0.95) (end -0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 22a85eb8-49ac-45a5-bbee-8921be28a900))
-  (fp_line (start 1.35 -0.95) (end 1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 288e61e0-3daf-41fc-bca7-39cb3316b573))
-  (fp_line (start -2.65 -0.95) (end -2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 28f6e920-0a08-49bc-a01f-34159875f245))
-  (fp_line (start -1.35 -0.95) (end -1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 319843fc-ae95-4bf7-9d69-5b18979e59d9))
-  (fp_line (start -1.65 -0.95) (end -1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 34ee19bf-6c45-4a0f-8710-a0d2721160d3))
-  (fp_line (start 2.35 -1.55) (end 2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 35f2ecae-f6bd-4ef1-b418-ee21d5fdfdb0))
-  (fp_line (start -2.35 -0.95) (end -2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 40e645bd-be8c-45bc-b10b-950a722f2959))
-  (fp_line (start 1.65 -0.95) (end 1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 453091ff-3786-4d6f-a944-5d77af4ddc33))
-  (fp_line (start 3.65 -1.55) (end 3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 476bcdb2-acf5-4db2-b08b-a1f271ff1d06))
-  (fp_line (start -5.65 -1.55) (end -5.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 4c573062-f11b-4be1-9187-104fe8ac673d))
-  (fp_line (start -0.65 -0.95) (end -0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 56533d87-2d15-4c9f-93aa-20ac4b740b19))
-  (fp_line (start 0.35 -1.55) (end 0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 62ba9896-0e8c-46c4-b6d9-c83942d0fe6f))
-  (fp_line (start 2.65 -1.55) (end 2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 63eb45db-1925-4281-8cf8-76058f11c442))
-  (fp_line (start -0.65 -1.55) (end -0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 65ca6bf1-7136-46f4-9f87-410706a9a333))
-  (fp_line (start -1.65 -1.55) (end -1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6c425130-8ed0-4957-a043-0bd406307903))
-  (fp_line (start 2.65 -0.95) (end 2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6d248bba-94eb-4c6a-91d2-d74a2321b417))
-  (fp_line (start 5.35 -1.55) (end 5.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6e78ab29-5954-480f-96d5-c8aea6160f07))
-  (fp_line (start -4.65 -0.95) (end -4.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6fbde31e-4d30-4db2-83df-141d99d3347f))
-  (fp_line (start -4.65 -1.55) (end -4.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 76ece86f-f954-4c1d-8310-56074d8c2bb0))
-  (fp_line (start 0.35 -0.95) (end 0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 77305b8b-2938-44cb-b4d4-f116a1f1db76))
-  (fp_line (start -3.35 -0.95) (end -3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 7b1d3dd8-2514-42b0-8785-fdf797052282))
-  (fp_line (start -7 -1.9) (end 7 -1.9) (layer "F.Fab") (width 0.1) (tstamp 7c15cf7f-38da-4350-913a-ea9dfa77c64f))
-  (fp_line (start -3.65 -1.55) (end -3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 827b98e0-d93f-4e97-95c4-679bffc3c3cf))
-  (fp_line (start 5.65 -0.95) (end 5.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 88945028-1f59-44a5-b510-56355c569400))
-  (fp_line (start -2.35 -1.55) (end -2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 933567bf-8cdd-4ea3-abf2-76e860843abc))
-  (fp_line (start 1.65 -1.55) (end 1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 93c8d06c-1535-44f4-a8a2-63f59587f5fd))
-  (fp_line (start -0.35 -1.55) (end -0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 99cb73f1-13eb-49d8-b891-9269320149b5))
-  (fp_line (start 0.65 -0.95) (end 0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 9b7c9658-5b3f-4991-8b42-bae11ca44078))
-  (fp_line (start 3.35 -0.95) (end 3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9d3ba0f5-1e8c-49d3-88a7-a903e49add03))
-  (fp_line (start -3.35 -1.55) (end -3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 9e81f7e0-13f6-4485-9578-297247bfe476))
-  (fp_line (start 0.65 -1.55) (end 0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp a8d3b867-a704-42c7-8d81-5dda764b6ed8))
-  (fp_line (start -7 1) (end 7 1) (layer "F.Fab") (width 0.1) (tstamp b2ed1f2a-605a-410e-a12d-446e070fcfa3))
-  (fp_line (start -2.65 -1.55) (end -2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp b4a55163-05b0-433b-ab9f-e720f362c495))
-  (fp_line (start 3.35 -1.55) (end 3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp c364c6a4-2b83-4d94-9c9e-5ff565af2d03))
-  (fp_line (start -6 1) (end -5.5 0.292893) (layer "F.Fab") (width 0.1) (tstamp d3416250-1ac2-4eb7-a9ba-e54a840a18fc))
-  (fp_line (start -3.65 -0.95) (end -3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp d76af720-4aab-4488-9acd-c5c5c7399997))
-  (fp_line (start -5.65 -0.95) (end -5.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp d9ccf6f1-32ce-4fdd-a0fc-ecafd0777e0e))
-  (fp_line (start 5.65 -1.55) (end 5.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp da4383cd-e756-4086-a01d-29651fedd3ba))
-  (fp_line (start -5.35 -1.55) (end -5.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp dd45035e-5910-4cf5-8539-d95249a46b53))
-  (fp_line (start -7 1) (end -7 -1.9) (layer "F.Fab") (width 0.1) (tstamp e229fed9-b5fe-4745-afbd-169b4e060aa7))
-  (fp_line (start 2.35 -0.95) (end 2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp e460606c-cd0d-4e3e-bac5-30725ce4764a))
-  (fp_line (start 4.65 -0.95) (end 4.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp e560c5c4-e958-4b8f-850f-153e456f1313))
-  (fp_line (start -4.35 -1.55) (end -4.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp e7e3716b-9ffd-4af8-a322-d4f48e8f4455))
-  (fp_line (start 7 1) (end 7 -1.9) (layer "F.Fab") (width 0.1) (tstamp f395b2c3-26ac-43b0-ac6e-a148fd7fdfcf))
-  (fp_line (start 1.35 -1.55) (end 1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp f99d9109-965f-47f7-be37-9a5328ece9bb))
-  (fp_line (start 5.35 -0.95) (end 5.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp fa1f2a3a-cd8c-4845-b093-bdd4c0913e67))
-  (pad "1" smd roundrect (at -5.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 247cae22-c99b-4099-b866-0ba07c05e724))
-  (pad "2" smd roundrect (at -4.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8f44c6a3-0480-4dbc-ade4-418967470f61))
-  (pad "3" smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e42e2a9b-3b64-4e3f-b8a1-a38350afab7b))
-  (pad "4" smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8beb5858-84da-4d81-87f7-ffb491c9bd88))
-  (pad "5" smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 42212414-e707-4f7e-b4c8-b421dd7835d8))
-  (pad "6" smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c445abb1-542d-41ee-9c8c-3feba1557df8))
-  (pad "7" smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 607436e7-53f7-4b16-808b-3f687a2f4e3c))
-  (pad "8" smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f263d1de-570b-4ce3-93c0-8b4048b501bb))
-  (pad "9" smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ae690289-7524-4153-a52b-c185e405a14b))
-  (pad "10" smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 10474d09-566d-4316-8062-4fca3bbabc2a))
-  (pad "11" smd roundrect (at 4.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f4224789-8af2-4ed6-8137-244add42b175))
-  (pad "12" smd roundrect (at 5.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3bab8db5-7586-4053-9300-3266ce15163f))
-  (pad "MP" smd roundrect (at 6.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 0fd6210d-256d-4cb7-9cf3-1cd76926091f))
-  (pad "MP" smd roundrect (at -6.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 6c1beb4d-310f-4625-a294-23d2b12bd4db))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM12B-SRSS-TB_1x12-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical.kicad_mod
index b5925afb7..dcb83f5a7 100644
--- a/Connector_JST.pretty/JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,105 +1,169 @@
-(footprint "JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM13B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ad0dcc38-4382-4ed1-b7c1-b03b381d218a)
   )
-  (fp_text value "JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d0c27987-5ac8-43c7-a937-85942555354e)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -7.5 1) (end 7.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.61 -0.04) (end -7.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 1.11) (end -6.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.56 1.11) (end -6.56 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 -0.04) (end 7.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 1.11) (end 6.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.44 -2.01) (end 6.44 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.5 -1.9) (end 7.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 1) (end -7.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.5 1) (end 7.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.15 -1.55) (end -6.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.15 -0.95) (end -5.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.85 -0.95) (end -5.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.85 -1.55) (end -6.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -1.55) (end -5.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -0.95) (end -4.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.85 -0.95) (end -4.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.85 -1.55) (end -5.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -1.55) (end -4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -0.95) (end -3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -0.95) (end -3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -1.55) (end -4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -1.55) (end -3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -0.95) (end -2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -0.95) (end -2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -1.55) (end -3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -1.55) (end -2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -0.95) (end -1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -0.95) (end -1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.55) (end -2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -1.55) (end -1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -0.95) (end -0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -0.95) (end -0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -1.55) (end -1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -1.55) (end -0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -0.95) (end 0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -0.95) (end 0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -1.55) (end -0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -1.55) (end 0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -0.95) (end 1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -0.95) (end 1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -1.55) (end 0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.55) (end 1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -0.95) (end 2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -0.95) (end 2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -1.55) (end 1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -1.55) (end 2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -0.95) (end 3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -0.95) (end 3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -1.55) (end 2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -1.55) (end 3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -0.95) (end 4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -0.95) (end 4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -1.55) (end 3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.85 -1.55) (end 4.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.85 -0.95) (end 5.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -0.95) (end 5.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -1.55) (end 4.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.85 -1.55) (end 5.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.85 -0.95) (end 6.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.15 -0.95) (end 6.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.15 -1.55) (end 5.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.4 -2.6) (end -8.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.4 2.6) (end 8.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 2.6) (end 8.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 -2.6) (end -8.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 1) (end -6 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 0.292893) (end -5.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1f5904c2-0e6b-41b8-a7c8-a00b6fa4abbf)
   )
-  (fp_line (start -6.44 -2.01) (end 6.44 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 02074df9-8c4b-4239-a4f8-c5f410042151))
-  (fp_line (start -7.61 -0.04) (end -7.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 20fc420f-e98a-4015-96ea-3dfa29d7ed2e))
-  (fp_line (start -7.61 1.11) (end -6.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 4f4bf230-f5db-473d-a7df-35b76e20cf13))
-  (fp_line (start 7.61 -0.04) (end 7.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 5d3d6378-1c39-454d-ad4f-cec2f726d5d3))
-  (fp_line (start -6.56 1.11) (end -6.56 2.1) (layer "F.SilkS") (width 0.12) (tstamp 92622564-4452-4163-bf5e-9bfa9972e117))
-  (fp_line (start 7.61 1.11) (end 6.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp e2943635-5bb8-4b19-ba32-3e4bc3b8ce6f))
-  (fp_line (start 8.4 2.6) (end 8.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 69d1b24f-2138-4dcd-93f9-f0b38055eded))
-  (fp_line (start 8.4 -2.6) (end -8.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 745d50e0-85cc-4644-b3a7-49be145a4790))
-  (fp_line (start -8.4 -2.6) (end -8.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp abcc4624-6ab9-4258-a7a4-cde7fd17eba3))
-  (fp_line (start -8.4 2.6) (end 8.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp bed2c16d-b5a5-4e84-9d96-9dde59bed559))
-  (fp_line (start 5.15 -1.55) (end 4.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 08a91cea-4991-4563-8fb6-7a94460f52c6))
-  (fp_line (start -1.85 -0.95) (end -1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 08fb643c-d2dd-4ec9-bc95-e1828b2e8ad3))
-  (fp_line (start -6.5 1) (end -6 0.292893) (layer "F.Fab") (width 0.1) (tstamp 0fea6339-b0a9-421e-8019-96fc496d5f3e))
-  (fp_line (start -1.15 -0.95) (end -0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1a40a163-ac16-4be6-a75f-d0260549ff8c))
-  (fp_line (start 1.85 -0.95) (end 2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 255862ee-ec90-4226-9547-6e3cbe06d9ef))
-  (fp_line (start 4.85 -1.55) (end 4.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 2631c518-232f-495a-99b2-bae8fc807635))
-  (fp_line (start 2.85 -1.55) (end 2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 2725749a-7e91-413e-b592-c333d7797e0b))
-  (fp_line (start 5.85 -1.55) (end 5.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 2f5304fe-7727-4d7e-b882-8a29485a7a8a))
-  (fp_line (start 4.15 -1.55) (end 3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3a0e5a01-8a5f-4325-9eea-117f89301bc9))
-  (fp_line (start -2.85 -1.55) (end -3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3aff78cc-c8d6-4bf9-927c-7e1a1489ee25))
-  (fp_line (start -1.85 -1.55) (end -2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4005f8ec-71c6-4aca-ae93-d9819b2153ba))
-  (fp_line (start 7.5 1) (end 7.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 4183f1d6-0307-4419-88d0-4edd75b1d423))
-  (fp_line (start 0.85 -1.55) (end 0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 48f4160f-be47-4eb3-a58f-95ffbc02c137))
-  (fp_line (start -3.85 -1.55) (end -4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4986dd99-08ba-4962-b1e3-d3fd18b3d05a))
-  (fp_line (start -7.5 1) (end 7.5 1) (layer "F.Fab") (width 0.1) (tstamp 49eb8eaf-eb14-4524-8421-b3f09e0cdd7b))
-  (fp_line (start -0.85 -0.95) (end -0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 5204e554-a242-4459-86de-7964e2be38b7))
-  (fp_line (start -0.85 -1.55) (end -1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 52c3c199-27e5-440b-bcb8-0176f19a6de7))
-  (fp_line (start -7.5 -1.9) (end 7.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 53ad3017-a51f-44e8-817b-e53632be6bde))
-  (fp_line (start 3.85 -1.55) (end 3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 58000816-5230-4ae4-bc78-aa4da514fdba))
-  (fp_line (start 0.15 -1.55) (end -0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 5e1848cf-e102-44d5-aecf-e6bb0e1a35e6))
-  (fp_line (start 1.15 -0.95) (end 1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6374265f-634f-4064-b186-fd6345cdd488))
-  (fp_line (start 3.15 -0.95) (end 3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 66bfeec4-915f-4608-8492-ac00432afba4))
-  (fp_line (start 1.15 -1.55) (end 0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6a3df2bf-39c3-4e5f-b33e-8d4063530b90))
-  (fp_line (start 2.85 -0.95) (end 3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6a611602-5726-4f6a-835a-68c46d365138))
-  (fp_line (start -6.15 -0.95) (end -5.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6b17d1c2-2e16-49d8-bb59-4225d27af7a9))
-  (fp_line (start -7.5 1) (end -7.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 6b538fa8-d05d-4e92-bdd0-482ac96e02ac))
-  (fp_line (start 6.15 -1.55) (end 5.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6b7585cb-b2ca-4ad0-b6f4-a5e9ba43ff59))
-  (fp_line (start 3.85 -0.95) (end 4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 6de9152d-693b-4d88-928b-0b1c50502dcf))
-  (fp_line (start -6.15 -1.55) (end -6.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 70904027-96fe-42f6-a539-07ac2e3d46db))
-  (fp_line (start -0.15 -1.55) (end -0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 7675383f-be17-4336-b3d0-6b3bcd57e1d4))
-  (fp_line (start -1.15 -1.55) (end -1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 80833e32-bf12-4169-a0dd-97d908bbf9f9))
-  (fp_line (start -5.15 -1.55) (end -5.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 843d4cf9-fa80-477c-96c7-ccced8af5b0b))
-  (fp_line (start -2.15 -1.55) (end -2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8b32ef74-ab27-4945-977d-08698ac95609))
-  (fp_line (start 4.85 -0.95) (end 5.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 91270d45-2e1c-42e8-9e9b-18da82c49418))
-  (fp_line (start -4.15 -0.95) (end -3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9c168b0b-1902-4cc2-a58b-419e959f1d07))
-  (fp_line (start 0.85 -0.95) (end 1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9dfd26ef-c6e6-4e7c-acd1-16de9a769a98))
-  (fp_line (start -3.15 -1.55) (end -3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9f2b200a-b014-4f5e-ba64-b28021243323))
-  (fp_line (start 5.85 -0.95) (end 6.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp a7f44525-01f6-41a1-b954-a6d38b297040))
-  (fp_line (start -6 0.292893) (end -5.5 1) (layer "F.Fab") (width 0.1) (tstamp a88a3e7b-246b-4257-a501-be7918792880))
-  (fp_line (start -4.85 -1.55) (end -5.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp a963ce35-b90f-4a78-96a8-e34b73a68589))
-  (fp_line (start 6.15 -0.95) (end 6.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp aabbc9fc-94ce-47a3-ba00-c837723b6d4e))
-  (fp_line (start -5.85 -1.55) (end -6.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp ad4d951b-a8c4-4aaf-a653-0d9ad062f8fd))
-  (fp_line (start 0.15 -0.95) (end 0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp ad767934-a36d-448d-ba26-0839e71160a3))
-  (fp_line (start -0.15 -0.95) (end 0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp b44f93e0-f62d-491c-8892-f123f237a4fd))
-  (fp_line (start -3.15 -0.95) (end -2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp b49ae95b-24e6-44fe-bc83-bc8073b15528))
-  (fp_line (start 1.85 -1.55) (end 1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp b88e575d-82ad-4324-a4ab-d771460b6dd8))
-  (fp_line (start -5.15 -0.95) (end -4.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp ca602310-58b0-464e-aaa1-f3bece10c2e6))
-  (fp_line (start 3.15 -1.55) (end 2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp cd5ee9a9-7764-4221-917f-41bfec87f108))
-  (fp_line (start 2.15 -1.55) (end 1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp d088c70a-2260-4316-9ae7-b4fd498a2e98))
-  (fp_line (start -5.85 -0.95) (end -5.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp d399b0d4-6596-46a6-bcb9-2d4a51460301))
-  (fp_line (start -4.85 -0.95) (end -4.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp d50388d0-6afa-4c4f-9109-3bf9cc71bbd5))
-  (fp_line (start -4.15 -1.55) (end -4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp d8696bee-f3e4-4b90-aaf9-db333e007ade))
-  (fp_line (start -2.85 -0.95) (end -2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp dbc0a5f6-a01f-4f8c-b0cb-64d4efcf8e18))
-  (fp_line (start -2.15 -0.95) (end -1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp e08c8a2e-d70f-4791-b392-8e2f7035fe3e))
-  (fp_line (start 2.15 -0.95) (end 2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp efd4c040-c8a4-4d49-9c12-e5208bc92fb7))
-  (fp_line (start 5.15 -0.95) (end 5.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp f9443e49-9013-4649-9ff4-66e474c35e3c))
-  (fp_line (start -3.85 -0.95) (end -3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp fcd579c6-2038-46f6-be2d-28156aac2cd8))
-  (fp_line (start 4.15 -0.95) (end 4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp fd114473-3544-4d80-8f30-000728d7a254))
-  (pad "1" smd roundrect (at -6 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 779910f6-eb5e-4e8b-a376-bf8f0037dd47))
-  (pad "2" smd roundrect (at -5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8a498ae4-d88a-411e-8b33-5ad65b540d0b))
-  (pad "3" smd roundrect (at -4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97c7fd63-00af-4aa1-aec3-9589661388f4))
-  (pad "4" smd roundrect (at -3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e87056a8-cad6-406d-b570-d68be59f8858))
-  (pad "5" smd roundrect (at -2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9b1f824f-d7cb-4a3a-a657-91eed0600da9))
-  (pad "6" smd roundrect (at -1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e7b44699-b3d0-41eb-892c-36b3cbae2e32))
-  (pad "7" smd roundrect (at 0 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c0ed686-99b3-4e67-bb22-03f9a0e69806))
-  (pad "8" smd roundrect (at 1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 546bb722-c51e-49d0-bb09-8a6a43b9b6b1))
-  (pad "9" smd roundrect (at 2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3f611bdc-54eb-47a0-8822-df63472ed7fb))
-  (pad "10" smd roundrect (at 3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7f59543d-e7ee-4570-936f-c15185f30a5a))
-  (pad "11" smd roundrect (at 4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 623bbdcd-5b75-45ef-a6a9-586362c402cc))
-  (pad "12" smd roundrect (at 5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 120d034b-dce9-4adf-b85c-a8f9dea573e6))
-  (pad "13" smd roundrect (at 6 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f934ca98-b1eb-4b2a-a144-550e07a13017))
-  (pad "MP" smd roundrect (at -7.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 30b462fa-af9c-431c-8ee9-afc9cafb4e13))
-  (pad "MP" smd roundrect (at 7.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5895ad7b-3b71-4797-ac33-4b77a98a0cfa))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM13B-SRSS-TB_1x13-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical.kicad_mod
index b5f9911aa..16e1ffa2e 100644
--- a/Connector_JST.pretty/JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,110 +1,178 @@
-(footprint "JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM14B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cd70e617-ea9d-4f9d-b33e-a6031120eb6c)
   )
-  (fp_text value "JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 62367a03-488f-4252-9a63-e3a4225340b5)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -8 1) (end 8 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.11 -0.04) (end -8.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.11 1.11) (end -7.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.06 1.11) (end -7.06 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.11 -0.04) (end 8.11 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.11 1.11) (end 7.06 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.94 -2.01) (end 6.94 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8 -1.9) (end 8 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 1) (end -8 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 1) (end 8 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.65 -1.55) (end -6.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.65 -0.95) (end -6.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.35 -0.95) (end -6.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.35 -1.55) (end -6.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.65 -1.55) (end -5.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.65 -0.95) (end -5.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.35 -0.95) (end -5.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.35 -1.55) (end -5.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.65 -1.55) (end -4.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.65 -0.95) (end -4.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.35 -0.95) (end -4.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.35 -1.55) (end -4.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -1.55) (end -3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.65 -0.95) (end -3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -0.95) (end -3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.35 -1.55) (end -3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -1.55) (end -2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -0.95) (end -2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -0.95) (end -2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.35 -1.55) (end -2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -1.55) (end -1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.65 -0.95) (end -1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -0.95) (end -1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.35 -1.55) (end -1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -1.55) (end -0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -0.95) (end -0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -0.95) (end -0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.35 -1.55) (end -0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -1.55) (end 0.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.35 -0.95) (end 0.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -0.95) (end 0.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.65 -1.55) (end 0.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -1.55) (end 1.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.35 -0.95) (end 1.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -0.95) (end 1.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.65 -1.55) (end 1.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -1.55) (end 2.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.35 -0.95) (end 2.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -0.95) (end 2.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -1.55) (end 2.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -1.55) (end 3.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.35 -0.95) (end 3.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -0.95) (end 3.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.65 -1.55) (end 3.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.35 -1.55) (end 4.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.35 -0.95) (end 4.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.65 -0.95) (end 4.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.65 -1.55) (end 4.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.35 -1.55) (end 5.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.35 -0.95) (end 5.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.65 -0.95) (end 5.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.65 -1.55) (end 5.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.35 -1.55) (end 6.35 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.35 -0.95) (end 6.65 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.65 -0.95) (end 6.65 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.65 -1.55) (end 6.35 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.9 -2.6) (end -8.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.9 2.6) (end 8.9 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.9 2.6) (end 8.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.9 -2.6) (end -8.9 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7 1) (end -6.5 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0.292893) (end -6 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 4.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 5.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 6.5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.8 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b3e4b357-46f0-4606-959f-f8e2db51baab)
   )
-  (fp_line (start -8.11 1.11) (end -7.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 2131f7dd-12cc-4137-88a1-ea46729429d8))
-  (fp_line (start -6.94 -2.01) (end 6.94 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 34d88786-d8e1-42e6-9fa4-c0f8cea50d53))
-  (fp_line (start 8.11 -0.04) (end 8.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 5a791928-8fd9-44dd-bc08-26437a3c62ad))
-  (fp_line (start -8.11 -0.04) (end -8.11 1.11) (layer "F.SilkS") (width 0.12) (tstamp 6bfede36-e0c5-4364-92e7-2efabd39e388))
-  (fp_line (start 8.11 1.11) (end 7.06 1.11) (layer "F.SilkS") (width 0.12) (tstamp 824fa472-cfe4-4703-86a7-23358eb86e8e))
-  (fp_line (start -7.06 1.11) (end -7.06 2.1) (layer "F.SilkS") (width 0.12) (tstamp b1ba6335-c697-40b0-992d-8cddf84d02fb))
-  (fp_line (start 8.9 -2.6) (end -8.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 2b31c416-eab4-48a1-b1a4-c73e418f03cc))
-  (fp_line (start 8.9 2.6) (end 8.9 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 2ca510a7-d7a5-4363-b3b3-43f4d0aba707))
-  (fp_line (start -8.9 -2.6) (end -8.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp b126ab45-3cc0-40d3-8e26-ea3ba6443d41))
-  (fp_line (start -8.9 2.6) (end 8.9 2.6) (layer "F.CrtYd") (width 0.05) (tstamp b5c8ceea-1c53-4be0-b524-bb6823afe43c))
-  (fp_line (start -0.65 -1.55) (end -0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0602a5fc-3c2b-4960-92a9-647d3ee2b646))
-  (fp_line (start -4.65 -0.95) (end -4.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 09a1163d-564d-4d41-af02-82e4f7eee1f9))
-  (fp_line (start 5.35 -0.95) (end 5.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0ad7cd84-ff8e-486a-9897-8087525d7904))
-  (fp_line (start -6.65 -0.95) (end -6.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 14df17c6-c9cb-433c-bfa0-cc2f4fc1cda5))
-  (fp_line (start 2.35 -0.95) (end 2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1b00d236-2149-41fb-bba4-b26275d823a4))
-  (fp_line (start 2.35 -1.55) (end 2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 3b0f7fac-8bc0-41b7-990d-dd664c1269a4))
-  (fp_line (start 3.35 -1.55) (end 3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 3de2e08e-5ca9-4593-8052-28dde0c89b52))
-  (fp_line (start 0.65 -0.95) (end 0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3eb4899a-b4d2-4e3d-9946-af467faf17b8))
-  (fp_line (start 6.65 -1.55) (end 6.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3ed46f72-7f2f-4f5a-ab58-d03b9afbbd29))
-  (fp_line (start -5.35 -0.95) (end -5.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3f349b1f-4147-4d1d-b57d-a1a1d18ea2a0))
-  (fp_line (start -3.35 -1.55) (end -3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3f9ffcea-f8cc-4514-90e8-3e6f13c8ebf4))
-  (fp_line (start 1.65 -1.55) (end 1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 47bdaac8-cb12-41aa-96e2-dcc7ed16ca7c))
-  (fp_line (start 6.35 -1.55) (end 6.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 4a9c5a73-0dc9-4180-98b2-55e415e563e4))
-  (fp_line (start 6.65 -0.95) (end 6.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4ea2cd5a-e122-4043-90bb-ba9dd1fe3a37))
-  (fp_line (start -6.65 -1.55) (end -6.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 52376a97-6e0d-4177-b0b5-4ebc24dc6ec2))
-  (fp_line (start -1.35 -1.55) (end -1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 529db7ab-673b-48db-b308-2214b050c6e2))
-  (fp_line (start -3.65 -0.95) (end -3.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 55ab4bf8-af6d-473f-a3db-e4cd9e0a25fe))
-  (fp_line (start -4.35 -1.55) (end -4.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 570a1dfe-e44f-42b7-809e-c081c4cfa0d9))
-  (fp_line (start -6.35 -0.95) (end -6.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 57fd1fd6-00a6-4e70-bc1a-0cd8b9dae872))
-  (fp_line (start -0.65 -0.95) (end -0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 59e66498-5b8c-4492-b47e-d43b475854fe))
-  (fp_line (start -5.65 -0.95) (end -5.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 5b7b26f0-95d4-43e8-9ac2-81620a80ce1a))
-  (fp_line (start 2.65 -0.95) (end 2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 629e4a7b-b71d-48d8-9c87-a53cfab9dafb))
-  (fp_line (start 1.35 -0.95) (end 1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 633ab44e-69e4-4681-a7d1-d4ac7a52a997))
-  (fp_line (start 4.65 -1.55) (end 4.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6864ec00-9d65-4512-a55f-adc2376ff809))
-  (fp_line (start -2.35 -1.55) (end -2.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 6f610ad2-05fb-4758-b2aa-d83238c1148a))
-  (fp_line (start -3.35 -0.95) (end -3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 708c472a-3142-48a0-a874-cec08a89ef78))
-  (fp_line (start -1.65 -0.95) (end -1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 71392846-b5a0-4ca1-811c-b02711d2d101))
-  (fp_line (start 0.65 -1.55) (end 0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 77d5d38d-f855-4849-91fe-1e38a259fe83))
-  (fp_line (start -6.5 0.292893) (end -6 1) (layer "F.Fab") (width 0.1) (tstamp 82eab375-fe17-417a-9526-14b333317a22))
-  (fp_line (start -2.35 -0.95) (end -2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 83cb0eaa-3cb0-40c5-8f22-720805b0bc6a))
-  (fp_line (start -2.65 -0.95) (end -2.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp 86a999c8-0950-49c9-b987-ed04f8b5a13c))
-  (fp_line (start 2.65 -1.55) (end 2.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 8bb8213f-92dc-491c-a8f5-ccef5b7c90be))
-  (fp_line (start 3.35 -0.95) (end 3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 8ce16840-1bde-4ba9-8e51-61d9f721067b))
-  (fp_line (start 4.65 -0.95) (end 4.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 8ce7ce95-f9a1-4b65-a121-c441d0712660))
-  (fp_line (start 5.65 -1.55) (end 5.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp 90202a2d-1ba8-4ee9-9830-fb9fbf7cfb3b))
-  (fp_line (start -0.35 -1.55) (end -0.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 92f0c906-29bd-44e9-bd72-2b696b5b188e))
-  (fp_line (start -5.35 -1.55) (end -5.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp 93a1f9e4-e707-4d70-b0d4-af2403a82517))
-  (fp_line (start -8 1) (end -8 -1.9) (layer "F.Fab") (width 0.1) (tstamp 963157a7-ffb6-46fb-97d4-c16c5833dc44))
-  (fp_line (start -4.65 -1.55) (end -4.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9a185923-8da8-4355-9835-31efcb07d499))
-  (fp_line (start -8 1) (end 8 1) (layer "F.Fab") (width 0.1) (tstamp 9bc2039d-a1bd-45aa-9560-192ebee025b9))
-  (fp_line (start -6.35 -1.55) (end -6.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp aae15dc4-3abc-48c5-8124-eeb4549d7fad))
-  (fp_line (start 4.35 -1.55) (end 4.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp ad53fb38-abfe-4e18-b141-2caadd547933))
-  (fp_line (start 3.65 -1.55) (end 3.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp aee818cf-9f79-4e3b-b479-125913059f0d))
-  (fp_line (start 0.35 -0.95) (end 0.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp b00af9d1-18de-486d-8362-2f9cbc5efc31))
-  (fp_line (start -7 1) (end -6.5 0.292893) (layer "F.Fab") (width 0.1) (tstamp b30baa3b-1a6d-49a2-ab59-dfaae6c3fe74))
-  (fp_line (start 5.35 -1.55) (end 5.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp b5d3faa5-d03a-44a2-a71d-310f60c61fb6))
-  (fp_line (start 4.35 -0.95) (end 4.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp ba425927-21ca-4ed7-9170-1284eaaffca2))
-  (fp_line (start 5.65 -0.95) (end 5.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp c7b51a49-0c86-41bd-a72e-2974a591155a))
-  (fp_line (start 1.35 -1.55) (end 1.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp c8e96e6b-8718-4ed7-887b-65a95406fb67))
-  (fp_line (start 6.35 -0.95) (end 6.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp cf764dbb-c1da-408e-887a-a34fddde1da2))
-  (fp_line (start -2.65 -1.55) (end -2.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp d077caec-4f52-44f9-ad07-c96fb99cbe70))
-  (fp_line (start -0.35 -0.95) (end -0.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp d9b6f824-5c72-485d-9c87-77dec85ed75b))
-  (fp_line (start 8 1) (end 8 -1.9) (layer "F.Fab") (width 0.1) (tstamp dffbc60e-2120-4896-8edc-1b74aaf19abd))
-  (fp_line (start 3.65 -0.95) (end 3.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp e0ca9ad9-b911-477e-82c9-cd5985b48b06))
-  (fp_line (start -3.65 -1.55) (end -3.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp e17bfc4d-bae0-4599-9f30-661476e1174a))
-  (fp_line (start 0.35 -1.55) (end 0.35 -0.95) (layer "F.Fab") (width 0.1) (tstamp e54f7a40-295e-465a-8143-14714dd23092))
-  (fp_line (start -1.65 -1.55) (end -1.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp e5e37010-ac1f-477b-ba70-3f5cf5a14a73))
-  (fp_line (start -8 -1.9) (end 8 -1.9) (layer "F.Fab") (width 0.1) (tstamp e8b519f7-f50a-49ab-ac31-27b0f8ff730e))
-  (fp_line (start -1.35 -0.95) (end -1.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp e8bc0360-1d02-4ded-bf9b-7531416b7fe2))
-  (fp_line (start 1.65 -0.95) (end 1.65 -1.55) (layer "F.Fab") (width 0.1) (tstamp f1de34b0-c1fc-4000-9b48-4aad3a841e9e))
-  (fp_line (start -4.35 -0.95) (end -4.35 -1.55) (layer "F.Fab") (width 0.1) (tstamp f63345d7-6ca0-4857-9159-09dc8e103bf9))
-  (fp_line (start -5.65 -1.55) (end -5.65 -0.95) (layer "F.Fab") (width 0.1) (tstamp f6fcc852-7063-4653-be02-0d5e71e82c52))
-  (pad "1" smd roundrect (at -6.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9a12a335-77bb-4d27-a178-3a01079a91c3))
-  (pad "2" smd roundrect (at -5.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8abd9177-96bd-4bb1-a0c6-519e7531d7a6))
-  (pad "3" smd roundrect (at -4.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eec77410-df25-4ac0-9f73-132249201cea))
-  (pad "4" smd roundrect (at -3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b9bed93d-0c7d-411e-96f7-541920c437dc))
-  (pad "5" smd roundrect (at -2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 44ce76ad-4230-471a-bb21-722e66d13799))
-  (pad "6" smd roundrect (at -1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 84652c1d-42ec-4031-8329-1bccf6dbf06b))
-  (pad "7" smd roundrect (at -0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dd8df90f-96e7-4631-89e8-a00e25ac8c70))
-  (pad "8" smd roundrect (at 0.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ecb57adc-baa9-4e4c-9285-85ad6c5af6c3))
-  (pad "9" smd roundrect (at 1.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9b7c5a91-3ed8-49ec-9efd-427722ad281e))
-  (pad "10" smd roundrect (at 2.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d20348a1-0f51-4901-958b-2459ffc4800f))
-  (pad "11" smd roundrect (at 3.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 56e6e8d2-266a-4970-8bc0-0f46427fca79))
-  (pad "12" smd roundrect (at 4.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5929a8ca-4e91-46e6-a0ef-db81120c2d40))
-  (pad "13" smd roundrect (at 5.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0d1dffaf-214e-4de7-91fa-1553b0dbb9a4))
-  (pad "14" smd roundrect (at 6.5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b31915d3-99d0-490f-9542-277c66d41ebb))
-  (pad "MP" smd roundrect (at 7.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5a52c7e9-bf06-4b66-82d5-7113f71c2f88))
-  (pad "MP" smd roundrect (at -7.8 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 8c9f4934-1554-4367-a309-ffc8aaf18d61))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM14B-SRSS-TB_1x14-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical.kicad_mod
index c2c9b7b85..772c7cb5d 100644
--- a/Connector_JST.pretty/JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical.kicad_mod
@@ -1,115 +1,187 @@
-(footprint "JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, BM15B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH side entry")
+  (tags "connector JST SH vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.3) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3c05e6d3-b84d-44b7-b44a-e73a04f76bad)
   )
-  (fp_text value "JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical" (at 0 3.3) (layer "F.Fab")
+  (fp_text value JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical (at 0 3.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1d29b192-7198-402c-97c6-862e22924720)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.25) (layer "F.Fab")
+  (fp_line (start -8.5 1) (end 8.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.61 -0.04) (end -8.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.61 1.11) (end -7.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.56 1.11) (end -7.56 2.1)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 -0.04) (end 8.61 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 1.11) (end 7.56 1.11)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.44 -2.01) (end 7.44 -2.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.5 -1.9) (end 8.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 1) (end -8.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 1) (end 8.5 -1.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.15 -1.55) (end -7.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.15 -0.95) (end -6.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.85 -0.95) (end -6.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.85 -1.55) (end -7.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.15 -1.55) (end -6.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.15 -0.95) (end -5.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.85 -0.95) (end -5.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.85 -1.55) (end -6.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -1.55) (end -5.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.15 -0.95) (end -4.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.85 -0.95) (end -4.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.85 -1.55) (end -5.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -1.55) (end -4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.15 -0.95) (end -3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -0.95) (end -3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -1.55) (end -4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -1.55) (end -3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.15 -0.95) (end -2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -0.95) (end -2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.85 -1.55) (end -3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -1.55) (end -2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.15 -0.95) (end -1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -0.95) (end -1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.55) (end -2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -1.55) (end -1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.15 -0.95) (end -0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -0.95) (end -0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.85 -1.55) (end -1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -1.55) (end -0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.15 -0.95) (end 0.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -0.95) (end 0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.15 -1.55) (end -0.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -1.55) (end 0.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.85 -0.95) (end 1.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -0.95) (end 1.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.15 -1.55) (end 0.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.55) (end 1.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -0.95) (end 2.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -0.95) (end 2.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.15 -1.55) (end 1.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -1.55) (end 2.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.85 -0.95) (end 3.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -0.95) (end 3.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.15 -1.55) (end 2.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -1.55) (end 3.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.85 -0.95) (end 4.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -0.95) (end 4.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.15 -1.55) (end 3.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.85 -1.55) (end 4.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.85 -0.95) (end 5.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -0.95) (end 5.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.15 -1.55) (end 4.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.85 -1.55) (end 5.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.85 -0.95) (end 6.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.15 -0.95) (end 6.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.15 -1.55) (end 5.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.85 -1.55) (end 6.85 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.85 -0.95) (end 7.15 -0.95)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.15 -0.95) (end 7.15 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.15 -1.55) (end 6.85 -1.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.4 -2.6) (end -9.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.4 2.6) (end 9.4 2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.4 2.6) (end 9.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.4 -2.6) (end -9.4 -2.6)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.5 1) (end -7 0.292893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 0.292893) (end -6.5 1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 4 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 5 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 6 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 7 1.325) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 8.3 -1.2) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp fb9ac458-1aaf-4562-aa32-2d564b2a1863)
   )
-  (fp_line (start -7.44 -2.01) (end 7.44 -2.01) (layer "F.SilkS") (width 0.12) (tstamp 0115afc4-ac30-4fd2-85f3-64572d79b25b))
-  (fp_line (start -7.56 1.11) (end -7.56 2.1) (layer "F.SilkS") (width 0.12) (tstamp 369b7254-4c8b-4355-a4bc-af329e37ac15))
-  (fp_line (start 8.61 -0.04) (end 8.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 3714d742-45b7-4c7a-b2f3-f99ac8fd303d))
-  (fp_line (start 8.61 1.11) (end 7.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp 542b31ee-5ac3-453d-ab9b-66f9ea5cf895))
-  (fp_line (start -8.61 -0.04) (end -8.61 1.11) (layer "F.SilkS") (width 0.12) (tstamp 80ad3401-0b06-4df4-bb3c-1a3af1a5d6d1))
-  (fp_line (start -8.61 1.11) (end -7.56 1.11) (layer "F.SilkS") (width 0.12) (tstamp ae69fea7-cf29-4a0c-9df4-b98626055039))
-  (fp_line (start -9.4 2.6) (end 9.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 0056aa0d-fc12-4eaf-b241-6b209e9572c1))
-  (fp_line (start 9.4 -2.6) (end -9.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp 3e1ebdf5-c6af-43e4-9221-a691889da89c))
-  (fp_line (start -9.4 -2.6) (end -9.4 2.6) (layer "F.CrtYd") (width 0.05) (tstamp 662690ae-af55-43f4-ad51-e579e4ec5ace))
-  (fp_line (start 9.4 2.6) (end 9.4 -2.6) (layer "F.CrtYd") (width 0.05) (tstamp f3168fa5-a938-47cd-8832-804b605b2460))
-  (fp_line (start 5.85 -0.95) (end 6.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0480b466-495f-4124-81d2-10bed23ef7b0))
-  (fp_line (start -1.15 -0.95) (end -0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 0729e5cb-9668-4614-baca-f25d9c261864))
-  (fp_line (start -4.15 -0.95) (end -3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 146d9ee9-6137-4131-959f-9db8041e79e4))
-  (fp_line (start 3.85 -1.55) (end 3.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1518dcb7-812b-46a5-ada1-c7e5bce2f108))
-  (fp_line (start -7.5 1) (end -7 0.292893) (layer "F.Fab") (width 0.1) (tstamp 186424d5-0345-4b02-84f1-0b71fabefb86))
-  (fp_line (start -0.15 -1.55) (end -0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 1b2e6e8a-3f63-4a20-b418-4a353dfe342b))
-  (fp_line (start 4.15 -1.55) (end 3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 1eb366ec-c787-4b2a-bafe-b84becbabf67))
-  (fp_line (start -3.85 -0.95) (end -3.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 225a90cc-a5cf-4b52-b958-ee885b548873))
-  (fp_line (start 4.85 -1.55) (end 4.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 22d651c5-88d7-4213-b6a5-88fcc63f1669))
-  (fp_line (start -8.5 -1.9) (end 8.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 2a21ef6a-6869-43e3-8685-bafe518547a5))
-  (fp_line (start -7.15 -1.55) (end -7.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 30d0a959-e610-4ab8-a69f-47498ffdb6bd))
-  (fp_line (start 4.85 -0.95) (end 5.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 348c73c2-008f-4d95-9cbc-37f180f57798))
-  (fp_line (start -2.85 -1.55) (end -3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3768ae0d-26ba-4aee-9f53-76ddbae7dd9a))
-  (fp_line (start 2.85 -1.55) (end 2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 3a718ac0-674a-45d9-8e86-1e2d8102ca06))
-  (fp_line (start 2.15 -0.95) (end 2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 3f1a249e-948e-45ab-9b2b-bfd3ec0cfbe7))
-  (fp_line (start 3.85 -0.95) (end 4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 4aad3cef-fb4d-4cc4-89cf-e7b78854d2ce))
-  (fp_line (start 3.15 -0.95) (end 3.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 4f440983-64ea-45c8-87e0-ec2a63600f12))
-  (fp_line (start 6.85 -0.95) (end 7.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 50357f15-07da-4067-8043-b75c1c14219c))
-  (fp_line (start -0.85 -0.95) (end -0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 5e2cb4b5-c960-4eca-95f6-9ef387ecf2af))
-  (fp_line (start 5.15 -1.55) (end 4.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp 69ca2843-4f61-4083-b28b-ba96b4136ac7))
-  (fp_line (start -7 0.292893) (end -6.5 1) (layer "F.Fab") (width 0.1) (tstamp 71bec420-325c-4003-b7d2-70e7c2e9b9b5))
-  (fp_line (start -4.15 -1.55) (end -4.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 75c9497c-50c0-4e63-8015-d43397d3ffdb))
-  (fp_line (start -4.85 -1.55) (end -5.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 7b4591b3-024f-406c-b5c2-2dd911678c0c))
-  (fp_line (start 7.15 -0.95) (end 7.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 7ba9c1b5-47f7-477b-8450-5a8a2619fd7a))
-  (fp_line (start 0.15 -1.55) (end -0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 84a5d035-2797-4836-bfc6-af6933e12226))
-  (fp_line (start -3.85 -1.55) (end -4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 84ac3476-355c-4a20-9ed5-afbf0dfb972f))
-  (fp_line (start -2.15 -0.95) (end -1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp 84d7ac74-fd2c-4073-a6d4-20a2c2b3f71a))
-  (fp_line (start -0.15 -0.95) (end 0.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 879ce0e9-110e-4646-abe1-fe3dca5eceb9))
-  (fp_line (start -1.15 -1.55) (end -1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 88aa099b-6e3c-4e0b-935f-1689e4a2de6b))
-  (fp_line (start -5.85 -1.55) (end -6.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 89fee6fc-7313-4644-949a-ed9396ac0504))
-  (fp_line (start -0.85 -1.55) (end -1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 951dba0b-58de-439a-8ce4-c5c2b5b41dea))
-  (fp_line (start 6.15 -0.95) (end 6.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 954f07a7-eda4-4be4-a4ac-4dfca73ef195))
-  (fp_line (start -8.5 1) (end -8.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp 9566fa7b-7d37-4cbb-bf25-16f7c205e2b7))
-  (fp_line (start 0.85 -0.95) (end 1.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp 9686228a-33c7-465e-a24a-e39f7c75a9ac))
-  (fp_line (start -1.85 -1.55) (end -2.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp 9aa88ef9-6136-4773-987f-a4b27e4693a8))
-  (fp_line (start -4.85 -0.95) (end -4.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp a8219e10-1553-4715-96d5-2943c99d4192))
-  (fp_line (start 4.15 -0.95) (end 4.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp a821df11-73cd-4bd6-822e-0b95f88f54ee))
-  (fp_line (start 5.15 -0.95) (end 5.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp a948b6f9-865f-4a7c-9631-bcf001b4dfcc))
-  (fp_line (start -6.85 -1.55) (end -7.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp abb8ee53-c6cb-4a6f-8b30-185c5fbaf598))
-  (fp_line (start 8.5 1) (end 8.5 -1.9) (layer "F.Fab") (width 0.1) (tstamp b347b824-068a-4b28-91af-3ea22ba0f193))
-  (fp_line (start 0.85 -1.55) (end 0.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp b5e13747-1baf-46bb-baf5-d81f2b3b85b5))
-  (fp_line (start 6.15 -1.55) (end 5.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp b618cd30-1cb4-45a4-a842-1bbfaac781fc))
-  (fp_line (start -6.85 -0.95) (end -6.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp b68ca4d6-c753-4367-94e3-5d043fb293bb))
-  (fp_line (start 5.85 -1.55) (end 5.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp b7956926-c308-4b18-ab26-7b7579e99a10))
-  (fp_line (start -1.85 -0.95) (end -1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp bd239c75-32a7-4fa1-948b-fc6fc6c6f64a))
-  (fp_line (start -8.5 1) (end 8.5 1) (layer "F.Fab") (width 0.1) (tstamp bdffb9a0-8663-4dab-a38f-9bf33a4b4c48))
-  (fp_line (start 2.15 -1.55) (end 1.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp be20296a-62ff-4f57-a785-fd9a8f44fa26))
-  (fp_line (start 0.15 -0.95) (end 0.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp c4b19f04-970f-466f-adfa-699ddb346114))
-  (fp_line (start -6.15 -1.55) (end -6.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp c616924e-3a34-4951-ba9f-59aa55247294))
-  (fp_line (start -5.85 -0.95) (end -5.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp cc77fb1e-07d3-40b9-9dba-79740c38468b))
-  (fp_line (start -3.15 -0.95) (end -2.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp cd3c5748-b76c-47dc-b016-52b34579a404))
-  (fp_line (start 3.15 -1.55) (end 2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp d2021b1f-23f5-4b70-8493-754190ccd691))
-  (fp_line (start -5.15 -1.55) (end -5.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp d8732b8d-7867-4210-a530-e8ad4a78c335))
-  (fp_line (start 7.15 -1.55) (end 6.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp d99aa6cc-8b8b-42ca-9ae8-8fa4af007203))
-  (fp_line (start -2.15 -1.55) (end -2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp dcbb6ddb-edb7-45ed-b403-75da0b630c53))
-  (fp_line (start 1.15 -1.55) (end 0.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp e5ef2a20-7159-49ad-968e-c0922e681471))
-  (fp_line (start -2.85 -0.95) (end -2.85 -1.55) (layer "F.Fab") (width 0.1) (tstamp e6a0524b-0e6b-4e29-b7a5-608a8b550ff3))
-  (fp_line (start -3.15 -1.55) (end -3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp e827e73c-363b-4ab1-9fe3-3022747060f8))
-  (fp_line (start -6.15 -0.95) (end -5.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp ead641aa-4bb0-4cd4-95c9-5c6dccc65c23))
-  (fp_line (start 1.85 -1.55) (end 1.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp ebf69396-b7c9-4f8d-937b-0d8fc7389c4f))
-  (fp_line (start 1.15 -0.95) (end 1.15 -1.55) (layer "F.Fab") (width 0.1) (tstamp f1f4c0cc-be94-4d77-9100-d1d7afc4354c))
-  (fp_line (start 2.85 -0.95) (end 3.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp f7745395-6cf5-477c-b2c1-9f5767306084))
-  (fp_line (start -7.15 -0.95) (end -6.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp fab339e5-523c-4753-a96e-cff88d298893))
-  (fp_line (start 6.85 -1.55) (end 6.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp fdfb9b25-230e-417e-8338-700dca426db9))
-  (fp_line (start -5.15 -0.95) (end -4.85 -0.95) (layer "F.Fab") (width 0.1) (tstamp ff82184e-82f0-464e-ac0c-af83d76e3ba8))
-  (fp_line (start 1.85 -0.95) (end 2.15 -0.95) (layer "F.Fab") (width 0.1) (tstamp ffb24146-64da-4b66-b39f-a0be95a93824))
-  (pad "1" smd roundrect (at -7 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bb437688-ca37-4d49-b8ab-c51a8739463a))
-  (pad "2" smd roundrect (at -6 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ed572313-b8f4-4609-9287-9ca687f5fa4f))
-  (pad "3" smd roundrect (at -5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp efc91da3-dda3-4163-be94-f0eadef473d2))
-  (pad "4" smd roundrect (at -4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a9efbd84-0d8c-4fe1-9102-ab0f5a2c22f3))
-  (pad "5" smd roundrect (at -3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0cce3895-f73c-4b1a-b311-a5123fde3b72))
-  (pad "6" smd roundrect (at -2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c8f4f4d6-3fbb-467a-a852-709469bdc7ea))
-  (pad "7" smd roundrect (at -1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2dd9c959-81f6-4031-b134-0217ca8a389a))
-  (pad "8" smd roundrect (at 0 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 29fb7622-7d64-456a-ae2e-0de99f1dd6b6))
-  (pad "9" smd roundrect (at 1 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f6be191f-968a-447f-8c07-0d6604222d20))
-  (pad "10" smd roundrect (at 2 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8dc03fff-8f5b-4a67-af0f-176aade6c92a))
-  (pad "11" smd roundrect (at 3 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 53ecc955-05d5-4af3-93da-93c6e0b62dc9))
-  (pad "12" smd roundrect (at 4 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 77c984ac-32e6-412f-bca1-1de289053a7e))
-  (pad "13" smd roundrect (at 5 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 48ad5c93-9660-40ac-bd2a-238774179c27))
-  (pad "14" smd roundrect (at 6 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 33bc9e7b-d9fe-4543-9ca3-7868d90331a1))
-  (pad "15" smd roundrect (at 7 1.325) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7c38ef33-1eb2-4a54-9ca4-2807cb11ce75))
-  (pad "MP" smd roundrect (at 8.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5add02e2-cd29-4dc4-890c-f4b88701921b))
-  (pad "MP" smd roundrect (at -8.3 -1.2) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp a3914ef6-9b4d-4e46-ad3a-992b327df26d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_BM15B-SRSS-TB_1x15-1MP_P1.00mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal.kicad_mod
index e4818f3a0..6d48a1e8e 100644
--- a/Connector_JST.pretty/JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,42 +1,54 @@
-(footprint "JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM02B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 378a2021-b241-4d03-a618-56391b3bae06)
   )
-  (fp_text value "JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5d00d779-73ed-4511-8a3e-fdbe6e413ce4)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -2 -1.675) (end 2 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.11 0.715) (end -2.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.11 -1.785) (end -1.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.06 -1.785) (end -1.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.11 0.715) (end 2.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.11 -1.785) (end 1.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.94 2.685) (end 0.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2 2.575) (end 2 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -1.675) (end -2 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -1.675) (end 2 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.9 -3.28) (end -2.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.9 3.28) (end 2.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.9 3.28) (end 2.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.9 -3.28) (end -2.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1 -1.675) (end -0.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.967893) (end 0 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 1.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6cdd3c55-2ebd-4d65-96c2-f94a513aa356)
   )
-  (fp_line (start -1.06 -1.785) (end -1.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 157ab3b2-de9d-4cdf-9554-940099eb1238))
-  (fp_line (start 2.11 0.715) (end 2.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 279a01d1-76f0-4263-8c9a-900039cd3784))
-  (fp_line (start 2.11 -1.785) (end 1.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 4aca678e-05a3-439c-9ba7-1d2a05d8b620))
-  (fp_line (start -2.11 0.715) (end -2.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 9a872ccb-adb8-48c3-b746-dc951dcb1638))
-  (fp_line (start -0.94 2.685) (end 0.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp a1fa1b2b-e0ca-4ede-9fef-a29aef00d540))
-  (fp_line (start -2.11 -1.785) (end -1.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp fd8a0ac1-16b0-4623-a014-8e719f4f0eb1))
-  (fp_line (start 2.9 3.28) (end 2.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 6a06dc1c-5c64-4c60-b313-b50aedc1aaa4))
-  (fp_line (start -2.9 3.28) (end 2.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp a058f584-b4c1-4058-8f9f-a79a121c0ea3))
-  (fp_line (start 2.9 -3.28) (end -2.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp e71734ff-cf16-4e5a-9856-63a03b1e3025))
-  (fp_line (start -2.9 -3.28) (end -2.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp f9453e94-1fa3-4c55-8df9-2787d8731b85))
-  (fp_line (start -2 -1.675) (end 2 -1.675) (layer "F.Fab") (width 0.1) (tstamp 5333d97a-1d4b-4e6e-8717-a421bf926d65))
-  (fp_line (start -1 -1.675) (end -0.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 5b20d148-1db7-4ba3-bc06-755c6061e592))
-  (fp_line (start -0.5 -0.967893) (end 0 -1.675) (layer "F.Fab") (width 0.1) (tstamp 86c2d333-70d7-43c7-a2ab-90430bda8e81))
-  (fp_line (start -2 2.575) (end 2 2.575) (layer "F.Fab") (width 0.1) (tstamp a540b156-ad3a-4bbf-9ec4-b4b94da1bbf4))
-  (fp_line (start -2 -1.675) (end -2 2.575) (layer "F.Fab") (width 0.1) (tstamp abf4771b-fc66-4ea8-8d4a-2128fcbde0e2))
-  (fp_line (start 2 -1.675) (end 2 2.575) (layer "F.Fab") (width 0.1) (tstamp af91c63a-91d4-4a47-8326-51b355b5cf57))
-  (pad "1" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2b2cf963-e749-4e96-a7cc-f10ec2b21437))
-  (pad "2" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f7034f98-c203-4ba4-8eae-2e04dedecb76))
-  (pad "MP" smd roundrect (at -1.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 01f8dc8b-78ce-4a18-a5d0-f25483b11967))
-  (pad "MP" smd roundrect (at 1.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp f60220aa-f7a7-463c-8195-c9a09c88a725))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM02B-SRSS-TB_1x02-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal.kicad_mod
index 07a23bf4f..3ce450893 100644
--- a/Connector_JST.pretty/JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,43 +1,55 @@
-(footprint "JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM03B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6528759d-c307-4b38-ad59-2c627fff9226)
   )
-  (fp_text value "JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f21dc044-8bed-47ad-a3ca-aa19af5133eb)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -2.5 -1.675) (end 2.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.61 0.715) (end -2.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.61 -1.785) (end -1.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.56 -1.785) (end -1.56 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.61 0.715) (end 2.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.61 -1.785) (end 1.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.44 2.685) (end 1.44 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.5 2.575) (end 2.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -1.675) (end -2.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -1.675) (end 2.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.4 -3.28) (end -3.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.4 3.28) (end 3.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.4 3.28) (end 3.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.4 -3.28) (end -3.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.5 -1.675) (end -1 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.967893) (end -0.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d55a8d66-4275-4234-a2b9-63388826156c)
   )
-  (fp_line (start -1.44 2.685) (end 1.44 2.685) (layer "F.SilkS") (width 0.12) (tstamp 4b204828-4fae-42db-b613-0740f7359d2a))
-  (fp_line (start 2.61 -1.785) (end 1.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 5f440c4f-51cf-4436-bd27-554d3985ee4f))
-  (fp_line (start -2.61 -1.785) (end -1.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 771d31aa-f7a9-43be-8179-cd94bfa5f3d7))
-  (fp_line (start -2.61 0.715) (end -2.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp a1ebfbf9-352d-478d-ae32-6c47ebbf7952))
-  (fp_line (start -1.56 -1.785) (end -1.56 -2.775) (layer "F.SilkS") (width 0.12) (tstamp b9797a82-1ae9-468f-98d0-c089851f3e00))
-  (fp_line (start 2.61 0.715) (end 2.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp c34c47d7-13b9-4b64-8a0e-f1fb992fa74d))
-  (fp_line (start -3.4 3.28) (end 3.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 64d4c782-f2f8-4d11-9c44-eba6b3fa22b3))
-  (fp_line (start 3.4 3.28) (end 3.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 8e717b9e-7ecf-4a77-aefb-4f6a31f7a985))
-  (fp_line (start 3.4 -3.28) (end -3.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 8f5d1a91-d16d-4eb9-aeae-c3709d19f391))
-  (fp_line (start -3.4 -3.28) (end -3.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 90e288a9-648e-4cfd-82d9-da86db43726a))
-  (fp_line (start -1 -0.967893) (end -0.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp 18ac3b15-46fd-4bca-8884-6ac7a2071db5))
-  (fp_line (start -2.5 -1.675) (end -2.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 5a4a31db-1381-4772-b5de-fa414979a793))
-  (fp_line (start 2.5 -1.675) (end 2.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 673eec34-21f8-4bd8-9af1-8063af7a996c))
-  (fp_line (start -2.5 2.575) (end 2.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 92216a6d-8f63-4771-bec8-1805e9a3488e))
-  (fp_line (start -2.5 -1.675) (end 2.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp b6993c77-8dee-4b82-bbf3-0629fdb470f2))
-  (fp_line (start -1.5 -1.675) (end -1 -0.967893) (layer "F.Fab") (width 0.1) (tstamp dc19ab2c-90d0-49f0-b381-c2962f2e99e8))
-  (pad "1" smd roundrect (at -1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cf415d1c-9e1a-4b11-8eba-ec7c9361d97a))
-  (pad "2" smd roundrect (at 0 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00d27945-4923-479a-961c-b6c23c95466b))
-  (pad "3" smd roundrect (at 1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d2971d40-1075-4baa-92b9-907e96b4a68e))
-  (pad "MP" smd roundrect (at 2.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 0a8636a3-3fac-4e8d-9226-a1208b6d6572))
-  (pad "MP" smd roundrect (at -2.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp af9dfdde-ffe5-4b67-bbbb-7ed1b905e3bb))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM03B-SRSS-TB_1x03-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal.kicad_mod
index dece968ca..2e828dd16 100644
--- a/Connector_JST.pretty/JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,44 +1,56 @@
-(footprint "JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM04B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 52f6ffa9-5c4c-4f56-b597-03a0d6903aa9)
   )
-  (fp_text value "JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp dbe91fae-ac1e-46eb-a0f2-f0dfff6a2010)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3 -1.675) (end 3 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.11 0.715) (end -3.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.11 -1.785) (end -2.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.06 -1.785) (end -2.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.11 0.715) (end 3.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.11 -1.785) (end 2.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.94 2.685) (end 1.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3 2.575) (end 3 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 -1.675) (end -3 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3 -1.675) (end 3 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.9 -3.28) (end -3.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.9 3.28) (end 3.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.9 3.28) (end 3.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.9 -3.28) (end -3.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2 -1.675) (end -1.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -0.967893) (end -1 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b07b068e-7d16-4526-8886-243bd64290f2)
   )
-  (fp_line (start -1.94 2.685) (end 1.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp 74730e07-24f7-4389-b564-17dea451f3cc))
-  (fp_line (start -3.11 0.715) (end -3.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 7e720787-1243-45d2-8504-31240bc56952))
-  (fp_line (start 3.11 0.715) (end 3.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 955de795-0dd9-47a8-b005-e6cb196025b1))
-  (fp_line (start -3.11 -1.785) (end -2.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 9623cd15-8197-4f08-a37c-c6959d1726f4))
-  (fp_line (start 3.11 -1.785) (end 2.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp d23a1ccd-f436-477f-a3c5-acca9f216da5))
-  (fp_line (start -2.06 -1.785) (end -2.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp ee1e2ca1-b04d-4136-ad4c-d17c2418e5d0))
-  (fp_line (start 3.9 -3.28) (end -3.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 02449c7f-adb0-44ae-a822-68e8e0cc3f78))
-  (fp_line (start -3.9 -3.28) (end -3.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 1bfd50f9-2686-4a2b-b49c-448ce0c538fb))
-  (fp_line (start 3.9 3.28) (end 3.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 54eb700b-3693-46a9-b2b3-e3651d2173df))
-  (fp_line (start -3.9 3.28) (end 3.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 5ecdbb6f-136b-4fb9-ba2d-6c8f0f0161b1))
-  (fp_line (start -1.5 -0.967893) (end -1 -1.675) (layer "F.Fab") (width 0.1) (tstamp 464a0284-0cb4-42d4-9e4a-3c0e4152f113))
-  (fp_line (start -3 -1.675) (end 3 -1.675) (layer "F.Fab") (width 0.1) (tstamp 4ba01ea1-2070-4554-aacc-d2111fde2789))
-  (fp_line (start 3 -1.675) (end 3 2.575) (layer "F.Fab") (width 0.1) (tstamp 8aa6e80a-b598-4fa3-a03d-9c113a988fbe))
-  (fp_line (start -2 -1.675) (end -1.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 8ce2daa2-486a-4cce-914e-816bcf02a1ef))
-  (fp_line (start -3 2.575) (end 3 2.575) (layer "F.Fab") (width 0.1) (tstamp c25991d3-db1e-46e0-afc6-aa98e512b748))
-  (fp_line (start -3 -1.675) (end -3 2.575) (layer "F.Fab") (width 0.1) (tstamp cb662ad1-069c-4469-974a-5d053fc4fdd2))
-  (pad "1" smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 17a10acd-6018-4ba7-8ecd-d4df812b64ef))
-  (pad "2" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b7e5121d-7433-403a-80c7-d646586632c9))
-  (pad "3" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e8da9d1-973b-4752-aba1-2a776a4ee377))
-  (pad "4" smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb22887d-b48e-430a-8cd6-9403b129548c))
-  (pad "MP" smd roundrect (at 2.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp a789a1fe-792d-4a94-a7b6-fd3c46b1af70))
-  (pad "MP" smd roundrect (at -2.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp cc6c3e3f-65ac-4f7d-ac20-a13420e44e7d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM04B-SRSS-TB_1x04-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal.kicad_mod
index 0c9c4893a..c4b39591f 100644
--- a/Connector_JST.pretty/JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,45 +1,57 @@
-(footprint "JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM05B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 96acbb49-f408-46a3-9ac0-51943aa31246)
   )
-  (fp_text value "JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4f8b440a-3b0a-4a4a-bc4e-44a6ca545118)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.5 -1.675) (end 3.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.61 0.715) (end -3.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.61 -1.785) (end -2.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.56 -1.785) (end -2.56 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 0.715) (end 3.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 -1.785) (end 2.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.44 2.685) (end 2.44 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.5 2.575) (end 3.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -1.675) (end -3.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -1.675) (end 3.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 -3.28) (end -4.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.4 3.28) (end 4.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 3.28) (end 4.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 -3.28) (end -4.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.5 -1.675) (end -2 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.967893) (end -1.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 3.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 788db7df-b4e6-4256-af97-5002ccd73885)
   )
-  (fp_line (start -3.61 -1.785) (end -2.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 33167123-bf1d-48ea-9607-4f26192679e1))
-  (fp_line (start -2.56 -1.785) (end -2.56 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 4abecc27-2bd4-45d3-9aa1-e56ac15be463))
-  (fp_line (start 3.61 0.715) (end 3.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 8ad8d525-612d-4fa1-b463-abc28f8d4699))
-  (fp_line (start 3.61 -1.785) (end 2.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp b9672ed1-011d-4f7f-81d3-c56c3f47bc81))
-  (fp_line (start -3.61 0.715) (end -3.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp c8e88e3a-8737-429d-9b13-111812be2c71))
-  (fp_line (start -2.44 2.685) (end 2.44 2.685) (layer "F.SilkS") (width 0.12) (tstamp f7935807-b039-4665-bcc5-f29c44afd76f))
-  (fp_line (start 4.4 3.28) (end 4.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 6664fb7f-0c77-4a8c-8089-9873bdb12430))
-  (fp_line (start -4.4 3.28) (end 4.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 9908f673-d2d9-490d-9e17-e57c782e9f84))
-  (fp_line (start 4.4 -3.28) (end -4.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp bfc2a977-89ff-4891-b7a2-3d45766f8b4c))
-  (fp_line (start -4.4 -3.28) (end -4.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp d9f0d843-a6f8-4a1e-addb-ebd976346acd))
-  (fp_line (start -2.5 -1.675) (end -2 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 0a0a566e-e7b5-42a2-8d93-7f5d9b6851a9))
-  (fp_line (start 3.5 -1.675) (end 3.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 7a363750-6858-4ea1-8d7c-3cf61e8e8417))
-  (fp_line (start -3.5 -1.675) (end 3.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp 8069dc7f-6c9e-43f7-a20e-dd1bba6b06f4))
-  (fp_line (start -3.5 2.575) (end 3.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 807a08f4-0294-4a09-ae29-84af786fd35d))
-  (fp_line (start -3.5 -1.675) (end -3.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 9f47f7b6-2edb-401a-8964-d1e8c696943a))
-  (fp_line (start -2 -0.967893) (end -1.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp d6134fc2-89c2-4947-856f-cfd52d6dc0e5))
-  (pad "1" smd roundrect (at -2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 77592ea4-19c7-4c4f-ab04-7cfb8dfc291f))
-  (pad "2" smd roundrect (at -1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7ccb9bfc-8d00-4c5d-adc7-b19582669a56))
-  (pad "3" smd roundrect (at 0 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f2b4d78b-d05e-4045-834e-9b61951cc948))
-  (pad "4" smd roundrect (at 1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 10961fdb-864d-4c33-940d-3e71da41af47))
-  (pad "5" smd roundrect (at 2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 56e1972f-b4c3-458a-92cb-d8915d5c3910))
-  (pad "MP" smd roundrect (at 3.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 2f43c385-5cdf-4c5f-aebb-ceb2871a74fa))
-  (pad "MP" smd roundrect (at -3.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 35bdf5d3-d314-40b1-a79d-a3f89b327b6e))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM05B-SRSS-TB_1x05-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal.kicad_mod
index 3231e74f7..88eb9c0c8 100644
--- a/Connector_JST.pretty/JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,46 +1,58 @@
-(footprint "JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM06B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 799cc0fe-c2b1-42c8-ac43-292e32f3cfae)
   )
-  (fp_text value "JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ca14ae6b-ef33-4cd0-8cf6-50bdbc40eac8)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4 -1.675) (end 4 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.11 0.715) (end -4.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.11 -1.785) (end -3.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.06 -1.785) (end -3.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.11 0.715) (end 4.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.11 -1.785) (end 3.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.94 2.685) (end 2.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4 2.575) (end 4 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -1.675) (end -4 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -1.675) (end 4 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.9 -3.28) (end -4.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.9 3.28) (end 4.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.9 3.28) (end 4.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.9 -3.28) (end -4.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3 -1.675) (end -2.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.967893) (end -2 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 3.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b05b4ee3-6341-4cac-82a2-c9cccd3dd1df)
   )
-  (fp_line (start -3.06 -1.785) (end -3.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 09ac6147-6492-44d6-99e0-42a01a6977e9))
-  (fp_line (start -4.11 -1.785) (end -3.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 55170eed-d525-41fc-be4d-25acdf50961b))
-  (fp_line (start 4.11 -1.785) (end 3.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 6181178b-730b-4909-89f1-42f2c2090889))
-  (fp_line (start 4.11 0.715) (end 4.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 6ccd93cc-0812-4b76-b221-13031b9360b4))
-  (fp_line (start -4.11 0.715) (end -4.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 9c8c1761-1371-4526-8d46-3bcc3fcbb774))
-  (fp_line (start -2.94 2.685) (end 2.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp dfc582f8-6ad6-43d3-9cfb-70017d1d7946))
-  (fp_line (start -4.9 -3.28) (end -4.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 022b296e-74a4-4014-83dc-a8f4399f88a0))
-  (fp_line (start 4.9 -3.28) (end -4.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 585f3ac3-0db1-4b78-953e-f9798033c89e))
-  (fp_line (start 4.9 3.28) (end 4.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 9f096811-eb23-4851-bef6-dcbd7f6a2290))
-  (fp_line (start -4.9 3.28) (end 4.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp e901ed1c-b4ef-4919-a45a-d831cc390159))
-  (fp_line (start -4 2.575) (end 4 2.575) (layer "F.Fab") (width 0.1) (tstamp 0f8bffed-faf8-46d9-9958-ef7a5d9b1f72))
-  (fp_line (start 4 -1.675) (end 4 2.575) (layer "F.Fab") (width 0.1) (tstamp 68aea61e-47c6-4a41-b545-42bb52472e94))
-  (fp_line (start -3 -1.675) (end -2.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 8c82aad6-2762-4994-a442-4f31008ea5bd))
-  (fp_line (start -4 -1.675) (end -4 2.575) (layer "F.Fab") (width 0.1) (tstamp 983d9cb1-7b60-49da-9d6c-00aeb30ae18c))
-  (fp_line (start -4 -1.675) (end 4 -1.675) (layer "F.Fab") (width 0.1) (tstamp e559e83d-dd01-461a-870e-49d2b807f5eb))
-  (fp_line (start -2.5 -0.967893) (end -2 -1.675) (layer "F.Fab") (width 0.1) (tstamp e62e1ea7-1c20-408e-a424-ee74d64ba220))
-  (pad "1" smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 565a9767-c907-4d82-b01e-7a5351a6adf7))
-  (pad "2" smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 447b7fe8-b5ad-4ee4-8c23-831491e155cd))
-  (pad "3" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9dca2e4a-cd08-484c-84ea-0f11ca1859df))
-  (pad "4" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 235a5cf0-9afe-4545-bfa3-da56553f074d))
-  (pad "5" smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 587a9d88-a818-4e91-b866-674ad137fe73))
-  (pad "6" smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 462b4ccd-f243-4c2e-a823-6cba24ced36f))
-  (pad "MP" smd roundrect (at 3.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 27953ecd-f43b-4fd0-ad0c-05b0febd9624))
-  (pad "MP" smd roundrect (at -3.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 6567ddc4-655b-4d2d-b6a5-d5676bd46c15))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM06B-SRSS-TB_1x06-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal.kicad_mod
index c8a102f22..5a7a3b857 100644
--- a/Connector_JST.pretty/JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,47 +1,59 @@
-(footprint "JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM07B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e7f059dd-4dba-4078-b23a-a707438b84fd)
   )
-  (fp_text value "JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ded29e96-98a5-431c-914c-198770fb6220)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4.5 -1.675) (end 4.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.61 0.715) (end -4.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.61 -1.785) (end -3.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.56 -1.785) (end -3.56 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 0.715) (end 4.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 -1.785) (end 3.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.44 2.685) (end 3.44 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.5 2.575) (end 4.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 -1.675) (end -4.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.5 -1.675) (end 4.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.4 -3.28) (end -5.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.4 3.28) (end 5.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.4 3.28) (end 5.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.4 -3.28) (end -5.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 -1.675) (end -3 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 -0.967893) (end -2.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1f2f3e69-904c-4063-a8d7-fe5341a7e433)
   )
-  (fp_line (start 4.61 -1.785) (end 3.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 496ae404-505a-44d2-a7b3-dc0fb9fe38e0))
-  (fp_line (start -3.56 -1.785) (end -3.56 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 6fe0859a-5ebb-45b4-960d-67af54ca61cb))
-  (fp_line (start -3.44 2.685) (end 3.44 2.685) (layer "F.SilkS") (width 0.12) (tstamp 8af9f203-0bee-4886-8cdf-7be323e1421c))
-  (fp_line (start -4.61 -1.785) (end -3.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 9de75769-b0bc-491e-9756-3b991f3cb0d9))
-  (fp_line (start 4.61 0.715) (end 4.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 9e90423e-bbe6-4154-a745-f7e1080af51d))
-  (fp_line (start -4.61 0.715) (end -4.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp a38b6898-73a5-464e-965c-2ed7ad819201))
-  (fp_line (start 5.4 -3.28) (end -5.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 56cf5f3d-ed30-40d9-87e8-ec68faecdb8b))
-  (fp_line (start 5.4 3.28) (end 5.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 821550b5-1eb1-4317-ac03-9b365ce1c841))
-  (fp_line (start -5.4 3.28) (end 5.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp a3a1d9bb-bf62-4d90-ae0d-0075d1cf878a))
-  (fp_line (start -5.4 -3.28) (end -5.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp a8ae46ec-27aa-416b-b59e-8122e85a5fd1))
-  (fp_line (start -4.5 -1.675) (end -4.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 03f75b51-79ba-4d1c-a270-a40173cf93f8))
-  (fp_line (start -3 -0.967893) (end -2.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp 362088b9-68ed-4202-a34b-d67bbe2030d8))
-  (fp_line (start -3.5 -1.675) (end -3 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 3aaa1d8f-7001-414a-95eb-32fa5d16fffc))
-  (fp_line (start -4.5 2.575) (end 4.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 6f2f1ca4-8afe-4976-8f20-f17a6caf2773))
-  (fp_line (start 4.5 -1.675) (end 4.5 2.575) (layer "F.Fab") (width 0.1) (tstamp b3e71f93-c4b8-40f6-83b2-d2c977976a44))
-  (fp_line (start -4.5 -1.675) (end 4.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp ebb5e00d-7777-4f46-9884-c1648fad5e3a))
-  (pad "1" smd roundrect (at -3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d3e3dc4b-fe7a-4367-ae9a-6ba5b9bfcb76))
-  (pad "2" smd roundrect (at -2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 438da30e-7080-4c70-82ca-fcc2e8c4c857))
-  (pad "3" smd roundrect (at -1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5b0ca4c3-2022-483a-b96f-ed91356364bb))
-  (pad "4" smd roundrect (at 0 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d71be8f0-00ad-426e-8a5e-69d3ef14d050))
-  (pad "5" smd roundrect (at 1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3b5ac22f-ca72-4251-ba66-1c38778f12e4))
-  (pad "6" smd roundrect (at 2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 180fc7e5-a94a-471b-b434-b18e7335b2b8))
-  (pad "7" smd roundrect (at 3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bd296479-f447-4a34-a064-459be10b0033))
-  (pad "MP" smd roundrect (at 4.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 4c89a256-2ce1-44f6-8b62-013a53eaf725))
-  (pad "MP" smd roundrect (at -4.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 8fe9055e-c795-4b51-aa63-b3e96001a71a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM07B-SRSS-TB_1x07-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal.kicad_mod
index a3c422293..8a0a04329 100644
--- a/Connector_JST.pretty/JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,48 +1,60 @@
-(footprint "JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM08B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2433ced2-7518-48bd-a913-90e516335a69)
   )
-  (fp_text value "JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 58506cda-ab4e-4be6-92b0-3cc8796416d9)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -5 -1.675) (end 5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.11 0.715) (end -5.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.11 -1.785) (end -4.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.06 -1.785) (end -4.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.11 0.715) (end 5.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.11 -1.785) (end 4.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.94 2.685) (end 3.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5 2.575) (end 5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -1.675) (end -5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 -1.675) (end 5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.9 -3.28) (end -5.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.9 3.28) (end 5.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.9 3.28) (end 5.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.9 -3.28) (end -5.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4 -1.675) (end -3.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.967893) (end -3 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 065a3a2e-2fdb-40b2-b667-d0034f3c07ea)
   )
-  (fp_line (start -4.06 -1.785) (end -4.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 1d69bec8-9094-4d8c-833c-d55a3cf39b56))
-  (fp_line (start 5.11 0.715) (end 5.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 2fb33447-f869-438e-a10f-ae5dd8ecc182))
-  (fp_line (start -5.11 0.715) (end -5.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 57612844-4bfc-433f-826f-08c7e06b64f7))
-  (fp_line (start -5.11 -1.785) (end -4.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 5f8911b4-bb1a-400b-839c-18e9ebf03822))
-  (fp_line (start 5.11 -1.785) (end 4.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp ce4ac9fd-fbca-4eaf-ac5a-b77d40d7c375))
-  (fp_line (start -3.94 2.685) (end 3.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp efe2f728-7f4a-4143-9b1f-f88d9fc91f0f))
-  (fp_line (start -5.9 3.28) (end 5.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 45b94323-ea22-4439-8bb2-ad5448905691))
-  (fp_line (start -5.9 -3.28) (end -5.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 4ae00c36-5ea0-47fd-8b3d-63f69c37ed2d))
-  (fp_line (start 5.9 3.28) (end 5.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 4b0e023a-959c-413b-8821-9ccbccbb2cae))
-  (fp_line (start 5.9 -3.28) (end -5.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 56816b00-84d9-4461-90fc-9221803a7447))
-  (fp_line (start -3.5 -0.967893) (end -3 -1.675) (layer "F.Fab") (width 0.1) (tstamp 02ae73fc-2974-4e61-860c-c6218e0bfe3f))
-  (fp_line (start -5 2.575) (end 5 2.575) (layer "F.Fab") (width 0.1) (tstamp 0e9e4b2c-1459-4b5e-a1d6-65a7d74b2746))
-  (fp_line (start -5 -1.675) (end 5 -1.675) (layer "F.Fab") (width 0.1) (tstamp 6ad2ca3d-608f-4e3f-a998-db5da912b56d))
-  (fp_line (start -4 -1.675) (end -3.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 9fd25f3f-5ff1-4548-881c-f8ee97491348))
-  (fp_line (start -5 -1.675) (end -5 2.575) (layer "F.Fab") (width 0.1) (tstamp a6084e16-e8c7-49d4-88b9-124fc01945ab))
-  (fp_line (start 5 -1.675) (end 5 2.575) (layer "F.Fab") (width 0.1) (tstamp cf03e25a-0dc7-4fd7-957c-2db3dceebd5d))
-  (pad "1" smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a92f13fd-e0fd-4679-8573-fe240692b659))
-  (pad "2" smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d695fe0a-aa64-4896-862f-51a8e070160f))
-  (pad "3" smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 336a2e63-40f1-4ec6-92f9-4457c4d38265))
-  (pad "4" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e36b5591-485b-4bd2-a2f5-687140e3e5ed))
-  (pad "5" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f24312f5-1174-4a94-82ac-b7937cab3b3e))
-  (pad "6" smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bb3889e5-5192-47e0-8512-6714947479d0))
-  (pad "7" smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d98fdd20-dec8-4811-a1b5-75f0030b1b5e))
-  (pad "8" smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e6f41b7e-aab9-46a7-ae23-dfb5521ef70e))
-  (pad "MP" smd roundrect (at -4.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 1e49ef52-b711-4376-af5e-22c5a4859606))
-  (pad "MP" smd roundrect (at 4.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp adbe3a0b-ae7e-4be7-ac08-cd93b0cb5229))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM08B-SRSS-TB_1x08-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal.kicad_mod
index aa8277747..f4436f030 100644
--- a/Connector_JST.pretty/JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,49 +1,61 @@
-(footprint "JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM09B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp bfa80567-76bd-4b04-af29-476bc6770cfe)
   )
-  (fp_text value "JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d667bfde-dd15-44ea-a422-b76badb4feb8)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -5.5 -1.675) (end 5.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.61 0.715) (end -5.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.61 -1.785) (end -4.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.56 -1.785) (end -4.56 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.61 0.715) (end 5.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.61 -1.785) (end 4.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.44 2.685) (end 4.44 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.5 2.575) (end 5.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -1.675) (end -5.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 -1.675) (end 5.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.4 -3.28) (end -6.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.4 3.28) (end 6.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.4 3.28) (end 6.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.4 -3.28) (end -6.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.5 -1.675) (end -4 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.967893) (end -3.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 5.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d6ad74b5-0849-4475-a37c-2e952f21bd34)
   )
-  (fp_line (start 5.61 0.715) (end 5.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 39becb4d-8263-4b74-bba9-4f87f1c253c1))
-  (fp_line (start 5.61 -1.785) (end 4.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 58e00dce-d7f6-49e0-bc3a-551cd9504dc0))
-  (fp_line (start -4.44 2.685) (end 4.44 2.685) (layer "F.SilkS") (width 0.12) (tstamp 60203c0d-8632-4f83-8b40-094a929d6323))
-  (fp_line (start -4.56 -1.785) (end -4.56 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 8a79de9e-53c4-44ae-b4df-cf542d7deb71))
-  (fp_line (start -5.61 -1.785) (end -4.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp c0a02311-c55b-473b-850e-32cd81a706ab))
-  (fp_line (start -5.61 0.715) (end -5.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp fe3448ae-a03c-4c0d-894a-e77dabd9996e))
-  (fp_line (start 6.4 3.28) (end 6.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 52c40990-b179-47e7-b93f-af7a3b1108b0))
-  (fp_line (start 6.4 -3.28) (end -6.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 59cc304c-0c6c-4483-aa17-d38a24ff353b))
-  (fp_line (start -6.4 -3.28) (end -6.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp b08479bb-dec5-4ecf-8820-b41bd8d06e6e))
-  (fp_line (start -6.4 3.28) (end 6.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp e026037d-2493-4235-906b-2736ef8c2cea))
-  (fp_line (start 5.5 -1.675) (end 5.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 05869a3e-c763-4b46-87fd-92e6ec5d0fba))
-  (fp_line (start -4 -0.967893) (end -3.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp 17b06bbc-6e38-4380-9750-e8ceffd62a0d))
-  (fp_line (start -5.5 -1.675) (end -5.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 558895bb-8043-4647-ab75-aee38fc1dcb8))
-  (fp_line (start -5.5 -1.675) (end 5.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp 80a4cf5a-cdd5-46d8-bab6-f0fd6c23ad54))
-  (fp_line (start -5.5 2.575) (end 5.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 83f299ab-66ae-49d9-8bc4-1f2fb2c98da5))
-  (fp_line (start -4.5 -1.675) (end -4 -0.967893) (layer "F.Fab") (width 0.1) (tstamp d683cc4e-67d2-4fa9-ad55-e88e4bd8c5c6))
-  (pad "1" smd roundrect (at -4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 90320595-d5b0-488d-87e2-7f24b2dc60a6))
-  (pad "2" smd roundrect (at -3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b413cf20-38f5-4e91-9264-dba130bd1d92))
-  (pad "3" smd roundrect (at -2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c1c839c-b665-4e72-982f-ee47983c1929))
-  (pad "4" smd roundrect (at -1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 60c5b29e-058e-49e0-a442-e79b0fb3913c))
-  (pad "5" smd roundrect (at 0 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 260d85e5-a77a-4dd7-aa0b-b276a6913eb2))
-  (pad "6" smd roundrect (at 1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c9f9fb28-3eae-4e20-85d3-b0c78d01aaae))
-  (pad "7" smd roundrect (at 2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eb27f73a-b7b3-431f-87d3-a01af0f1ede0))
-  (pad "8" smd roundrect (at 3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0587fe32-039d-4268-931b-1821e6a8212f))
-  (pad "9" smd roundrect (at 4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7f8fdaa7-c05c-4ff9-aa28-bc4cd47b1303))
-  (pad "MP" smd roundrect (at 5.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 4aa2f285-fc1c-4370-924d-57621a41d1ab))
-  (pad "MP" smd roundrect (at -5.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp f6f2a2a3-fd3d-43c5-807c-725f52d7247b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM09B-SRSS-TB_1x09-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal.kicad_mod
index 31e2073a6..dfbf00e71 100644
--- a/Connector_JST.pretty/JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,50 +1,62 @@
-(footprint "JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM10B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 64c17a26-77ad-47a2-8607-99e18c389e4e)
   )
-  (fp_text value "JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f075f3b2-289f-42e8-89ec-0707801d3bba)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -6 -1.675) (end 6 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.11 0.715) (end -6.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 -1.785) (end -5.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.06 -1.785) (end -5.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 0.715) (end 6.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 -1.785) (end 5.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.94 2.685) (end 4.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6 2.575) (end 6 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -1.675) (end -6 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 -1.675) (end 6 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.9 -3.28) (end -6.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.9 3.28) (end 6.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.9 3.28) (end 6.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.9 -3.28) (end -6.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5 -1.675) (end -4.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 -0.967893) (end -4 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 5.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6056d20b-e2a9-4493-9e00-1010186ec647)
   )
-  (fp_line (start 6.11 0.715) (end 6.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 20a0ac82-07bb-4acd-b689-d336034941e7))
-  (fp_line (start -5.06 -1.785) (end -5.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 3dd1433d-f38d-40bd-bc23-66772c5a2372))
-  (fp_line (start 6.11 -1.785) (end 5.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 6359207f-d05e-4fcf-95b3-8b2b2a3a614d))
-  (fp_line (start -6.11 0.715) (end -6.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp b625cb33-553b-48f6-af8a-458b117d45e7))
-  (fp_line (start -4.94 2.685) (end 4.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp ee869e09-dbf2-449a-8063-3c4126778055))
-  (fp_line (start -6.11 -1.785) (end -5.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp f7271489-1951-4ef7-9770-a205b091715c))
-  (fp_line (start -6.9 3.28) (end 6.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 28f6f6bf-94cf-4bed-abf8-5fe147ee992f))
-  (fp_line (start -6.9 -3.28) (end -6.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 2dd2741e-e896-4c7c-b0c2-7140ea809c4f))
-  (fp_line (start 6.9 3.28) (end 6.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 3afe17d6-cb92-48dd-9551-87dec63afe58))
-  (fp_line (start 6.9 -3.28) (end -6.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 88506ef2-ccc8-43df-86b7-51ee89ed5918))
-  (fp_line (start -6 -1.675) (end -6 2.575) (layer "F.Fab") (width 0.1) (tstamp 2c1b5d4a-dd09-4eea-a03f-f81d9df35405))
-  (fp_line (start -5 -1.675) (end -4.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 648765d6-dd4a-4471-8786-9ab934a52261))
-  (fp_line (start -6 -1.675) (end 6 -1.675) (layer "F.Fab") (width 0.1) (tstamp 92d1020d-78f7-439e-bcaa-28dbcfd4d131))
-  (fp_line (start -4.5 -0.967893) (end -4 -1.675) (layer "F.Fab") (width 0.1) (tstamp 9b6d36fb-c2e7-4bfc-bbc1-efe2817bfee6))
-  (fp_line (start 6 -1.675) (end 6 2.575) (layer "F.Fab") (width 0.1) (tstamp e0605a60-f08b-46e8-80c5-5407d89a0b3c))
-  (fp_line (start -6 2.575) (end 6 2.575) (layer "F.Fab") (width 0.1) (tstamp fc840d36-dee9-467c-9598-372514da0fc8))
-  (pad "1" smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 42502e54-409c-406d-a4f3-5cc5012b50bc))
-  (pad "2" smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f78467af-b6f0-4612-be44-eb07fd66bb1b))
-  (pad "3" smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d363d4ef-92ba-47cc-8ca9-58d48e8c0b4a))
-  (pad "4" smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c36f5da7-01c0-4423-a4be-9347680ca0c7))
-  (pad "5" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0868b39b-e453-4c7b-a6cd-0c60d9a717ad))
-  (pad "6" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8ffa7c76-cd0b-4f4a-84f2-a705bb8e140b))
-  (pad "7" smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7c2bf90e-86b2-4783-80dc-d79b4c4b86d3))
-  (pad "8" smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97958ab4-8b67-4225-a380-4d4cf34d0359))
-  (pad "9" smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0f4db4a0-25cf-42cc-806f-ee56b8806593))
-  (pad "10" smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 044f028a-a55c-4133-ac67-2d45be0cda63))
-  (pad "MP" smd roundrect (at 5.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5a5b2786-ef21-49d6-81fa-e2aedf0963cc))
-  (pad "MP" smd roundrect (at -5.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp d6db97d9-c7b1-4023-8d69-f45720aaadd0))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM10B-SRSS-TB_1x10-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal.kicad_mod
index 2302e1131..925795676 100644
--- a/Connector_JST.pretty/JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,51 +1,63 @@
-(footprint "JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM11B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 857f8a2d-ee76-4cf5-91b2-63f926b0c164)
   )
-  (fp_text value "JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d6aea4fc-f291-4d58-ad86-1c7644294d92)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -6.5 -1.675) (end 6.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.61 0.715) (end -6.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.61 -1.785) (end -5.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.56 -1.785) (end -5.56 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.61 0.715) (end 6.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.61 -1.785) (end 5.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.44 2.685) (end 5.44 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.5 2.575) (end 6.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -1.675) (end -6.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -1.675) (end 6.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.4 -3.28) (end -7.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.4 3.28) (end 7.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.4 3.28) (end 7.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.4 -3.28) (end -7.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 -1.675) (end -5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.967893) (end -4.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 667adb83-819f-4b59-92f2-fa385d8f42c5)
   )
-  (fp_line (start 6.61 0.715) (end 6.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 0d484e9a-6b4f-4eef-b29e-bc2f4f9e5d5a))
-  (fp_line (start 6.61 -1.785) (end 5.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 5cc6d6a5-52d1-4fc5-977b-b343db56dcad))
-  (fp_line (start -6.61 0.715) (end -6.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp a675609f-e9aa-4ccf-8b31-ba3a725896c0))
-  (fp_line (start -6.61 -1.785) (end -5.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp ae887e4d-9b9a-421a-ab81-a9b5d9194156))
-  (fp_line (start -5.56 -1.785) (end -5.56 -2.775) (layer "F.SilkS") (width 0.12) (tstamp c517a6e6-544d-498d-a2c7-7e600f047a0f))
-  (fp_line (start -5.44 2.685) (end 5.44 2.685) (layer "F.SilkS") (width 0.12) (tstamp d4d04e3c-c733-42ea-b765-0f3171dc74f3))
-  (fp_line (start -7.4 -3.28) (end -7.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 00a2fc37-7b6b-465c-991c-9ae07f6b96f0))
-  (fp_line (start 7.4 -3.28) (end -7.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 2167f47a-83d2-4927-a00d-19314716d6ac))
-  (fp_line (start 7.4 3.28) (end 7.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp c509ceda-c98e-4c41-9f30-06b4baf7d05f))
-  (fp_line (start -7.4 3.28) (end 7.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp d80526f6-d869-4491-ab49-c4a28fa87120))
-  (fp_line (start -6.5 2.575) (end 6.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 25ae875c-b845-46b1-8270-7d3a466b7ce4))
-  (fp_line (start -5.5 -1.675) (end -5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 9aaad769-5e37-4e42-be42-af3791213798))
-  (fp_line (start 6.5 -1.675) (end 6.5 2.575) (layer "F.Fab") (width 0.1) (tstamp b4b1cfd3-6187-4c1e-bc87-cb6abe03a455))
-  (fp_line (start -6.5 -1.675) (end 6.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp c05f6777-c761-4dda-b986-5e55e195310a))
-  (fp_line (start -6.5 -1.675) (end -6.5 2.575) (layer "F.Fab") (width 0.1) (tstamp da0d5d97-cd95-4714-9598-3849a0ff9c97))
-  (fp_line (start -5 -0.967893) (end -4.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp dce17bbc-51c2-41f7-aeb0-9f37d34c43bd))
-  (pad "1" smd roundrect (at -5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e5d69be0-b92c-4014-b52e-702a3ec09026))
-  (pad "2" smd roundrect (at -4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e668662e-7e5a-4934-a694-ca3c9791438b))
-  (pad "3" smd roundrect (at -3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b0e58082-673f-4110-9410-fd232d043f82))
-  (pad "4" smd roundrect (at -2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 25b035ca-1237-48e7-b261-c5587fc21841))
-  (pad "5" smd roundrect (at -1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2b196c55-0cc4-4360-afee-d27c9bf342b4))
-  (pad "6" smd roundrect (at 0 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6995cca0-ca3d-47d2-b3ba-ca5bd6b6042d))
-  (pad "7" smd roundrect (at 1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 33a5cedc-1b42-4c6a-8d1e-7ace15b439ab))
-  (pad "8" smd roundrect (at 2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 521412e2-e29f-491d-80dd-0c017e9daaad))
-  (pad "9" smd roundrect (at 3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7dc53fd9-fd73-4ed0-9ceb-2ca99c382385))
-  (pad "10" smd roundrect (at 4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 685f9a65-9319-4ab2-acc2-f1447c62f86d))
-  (pad "11" smd roundrect (at 5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b2fe2d8a-d97a-48c5-813a-84307ae6111f))
-  (pad "MP" smd roundrect (at 6.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 9a3cdd64-ac8c-4478-96d5-ccca3d4acaaf))
-  (pad "MP" smd roundrect (at -6.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 9b65ee37-636e-4ce1-91d6-4817e1be515c))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM11B-SRSS-TB_1x11-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal.kicad_mod
index 68e49ab3a..c17652714 100644
--- a/Connector_JST.pretty/JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,52 +1,64 @@
-(footprint "JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM12B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 87582100-9503-4875-8285-40feb8850efe)
   )
-  (fp_text value "JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a252f2fd-b2e6-47ec-920d-6c2cb31e396b)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7 -1.675) (end 7 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.11 0.715) (end -7.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.11 -1.785) (end -6.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.06 -1.785) (end -6.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.11 0.715) (end 7.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.11 -1.785) (end 6.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.94 2.685) (end 5.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7 2.575) (end 7 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -1.675) (end -7 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 -1.675) (end 7 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.9 -3.28) (end -7.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.9 3.28) (end 7.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.9 3.28) (end 7.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.9 -3.28) (end -7.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6 -1.675) (end -5.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -0.967893) (end -5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ec1ed9c1-f437-48e9-add2-7bf293a40ee8)
   )
-  (fp_line (start -5.94 2.685) (end 5.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp 4ae096a2-800a-4c73-9e8b-e1d2922d0395))
-  (fp_line (start -6.06 -1.785) (end -6.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 7b35c163-be7b-46d0-a15d-e1447f9d0c5e))
-  (fp_line (start 7.11 0.715) (end 7.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 88486338-dde4-4eb9-9d31-7bed09da9ed2))
-  (fp_line (start 7.11 -1.785) (end 6.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 8eb27919-435f-437b-9ad4-375348f28347))
-  (fp_line (start -7.11 0.715) (end -7.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp c39cf947-5a80-43ec-a145-b8afdb866144))
-  (fp_line (start -7.11 -1.785) (end -6.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp f5d52c27-4e5e-4fcc-aa31-a20f48af3536))
-  (fp_line (start 7.9 -3.28) (end -7.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 11103b24-d5e9-4217-b654-596f9699ff22))
-  (fp_line (start 7.9 3.28) (end 7.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 2552014e-e3b7-408e-8341-f9ee98bdca8a))
-  (fp_line (start -7.9 3.28) (end 7.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 56729b8b-72f5-44e3-87c7-993b342f4acf))
-  (fp_line (start -7.9 -3.28) (end -7.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 5a5ee633-2641-4671-ab58-d70be3056ec1))
-  (fp_line (start -7 -1.675) (end 7 -1.675) (layer "F.Fab") (width 0.1) (tstamp 2eba17a0-8c78-40c7-8ae6-8b8cf1cb615b))
-  (fp_line (start -7 -1.675) (end -7 2.575) (layer "F.Fab") (width 0.1) (tstamp 3d202bb1-0bad-44c0-9e63-268698f05bc2))
-  (fp_line (start 7 -1.675) (end 7 2.575) (layer "F.Fab") (width 0.1) (tstamp 8307097c-dd83-4f6b-8315-81c35ec2ae13))
-  (fp_line (start -5.5 -0.967893) (end -5 -1.675) (layer "F.Fab") (width 0.1) (tstamp b2427327-af2a-42f0-b803-a3ca09ef2c81))
-  (fp_line (start -7 2.575) (end 7 2.575) (layer "F.Fab") (width 0.1) (tstamp e4a7bcc8-a2fa-4005-b4e6-9bbddcfdaeff))
-  (fp_line (start -6 -1.675) (end -5.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp eb4209f4-3635-44d2-b70a-4b6e5362863b))
-  (pad "1" smd roundrect (at -5.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2a475467-94a2-4e08-be73-6c2c8ddd7c76))
-  (pad "2" smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 409c6650-9765-4502-9e2d-2e43bf139c7f))
-  (pad "3" smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 04e8bca3-d57d-4228-885f-2bd9ac6ad4e0))
-  (pad "4" smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6f8cdbcc-2140-4ea6-9578-995e248d6579))
-  (pad "5" smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5091a57b-17ca-4a6b-a2d2-670b50601772))
-  (pad "6" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b5d00a78-b3d6-4bf5-8689-f340bba17ab2))
-  (pad "7" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0789b256-cf8c-4aeb-a0e4-cd4bee7e1ad6))
-  (pad "8" smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b48f0b36-0ae5-4e58-881a-9e5e1105fcb8))
-  (pad "9" smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 986789b0-5ccf-4319-bc5c-432ef1b2634d))
-  (pad "10" smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f1ce0cb6-8960-437a-a9ee-a4c056080b1a))
-  (pad "11" smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2b80c05f-155e-4779-a02d-fa87b5e025e3))
-  (pad "12" smd roundrect (at 5.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e7e845f9-9af7-4f31-a5a6-5e46fe56bbc3))
-  (pad "MP" smd roundrect (at -6.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 452c28a7-e857-4425-904a-23427c4b432e))
-  (pad "MP" smd roundrect (at 6.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp ae005fd6-83b7-423c-b7b0-f5af48790292))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM12B-SRSS-TB_1x12-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal.kicad_mod
index fa9564ec5..a4c4f6bf7 100644
--- a/Connector_JST.pretty/JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,53 +1,65 @@
-(footprint "JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM13B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2ccbc38a-e975-4bc4-8f15-f2f9df64b412)
   )
-  (fp_text value "JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9b220182-593e-4e12-b19c-a85c5d97aa7c)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7.5 -1.675) (end 7.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.61 0.715) (end -7.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 -1.785) (end -6.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.56 -1.785) (end -6.56 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 0.715) (end 7.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 -1.785) (end 6.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.44 2.685) (end 6.44 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.5 2.575) (end 7.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 -1.675) (end -7.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.5 -1.675) (end 7.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.4 -3.28) (end -8.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.4 3.28) (end 8.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 3.28) (end 8.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 -3.28) (end -8.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 -1.675) (end -6 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -0.967893) (end -5.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3fce6aa0-9624-4c0b-baeb-45b8fdfff7c1)
   )
-  (fp_line (start 7.61 -1.785) (end 6.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 595d81b0-c177-49b3-b3c9-de467fe2a0fc))
-  (fp_line (start -7.61 0.715) (end -7.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 661e678f-be23-4998-8f7a-b17050fdf524))
-  (fp_line (start -6.44 2.685) (end 6.44 2.685) (layer "F.SilkS") (width 0.12) (tstamp 9a415519-2a44-49fc-9b52-425caf3f460d))
-  (fp_line (start 7.61 0.715) (end 7.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 9bb5deee-71e4-4ed3-bf45-98ec49cdd701))
-  (fp_line (start -6.56 -1.785) (end -6.56 -2.775) (layer "F.SilkS") (width 0.12) (tstamp c79908bb-8a25-4086-a6c6-13264d1c39ef))
-  (fp_line (start -7.61 -1.785) (end -6.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp d602ca44-baec-417b-b503-02f6939b8245))
-  (fp_line (start -8.4 -3.28) (end -8.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 260d7df5-89c0-4714-8567-f6c936845875))
-  (fp_line (start 8.4 -3.28) (end -8.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 68dfb926-f7b4-4f7e-9811-c3dd650ff614))
-  (fp_line (start 8.4 3.28) (end 8.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 977faf29-9959-484e-9f29-4dd2594a7989))
-  (fp_line (start -8.4 3.28) (end 8.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp f603d198-3b4c-4f20-93e5-441d14996ce6))
-  (fp_line (start -7.5 -1.675) (end -7.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 204fde1b-ef6e-498d-b0a4-4e5e744725ee))
-  (fp_line (start -6 -0.967893) (end -5.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp 5f71ffda-e678-447a-bb71-218c97b6d839))
-  (fp_line (start -7.5 2.575) (end 7.5 2.575) (layer "F.Fab") (width 0.1) (tstamp b81edc4e-dcb7-44cf-ad87-d523bda759d0))
-  (fp_line (start -6.5 -1.675) (end -6 -0.967893) (layer "F.Fab") (width 0.1) (tstamp bd41fc22-7822-4d52-9af0-cf6dbb60583a))
-  (fp_line (start -7.5 -1.675) (end 7.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp c05176bd-8a6c-4edb-bb92-e66d7d65bc0a))
-  (fp_line (start 7.5 -1.675) (end 7.5 2.575) (layer "F.Fab") (width 0.1) (tstamp f95292f7-1545-4e13-b349-eb5ed2d24839))
-  (pad "1" smd roundrect (at -6 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9645005e-70bc-40b0-bbfd-6290be6d4c20))
-  (pad "2" smd roundrect (at -5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 91d29da7-8ced-4792-98cc-974b428391ed))
-  (pad "3" smd roundrect (at -4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 182c8a33-6295-4a09-9062-4d20cb10c142))
-  (pad "4" smd roundrect (at -3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 34ee9a3e-a2a5-457f-bb54-2f37ea521a9b))
-  (pad "5" smd roundrect (at -2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8f99f839-61f5-4ae5-ad22-535492b5f712))
-  (pad "6" smd roundrect (at -1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7f99627e-77fc-4b92-b0a1-0e46d4aa9073))
-  (pad "7" smd roundrect (at 0 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7fb7a4c3-b15f-4839-b58f-c23456a1567e))
-  (pad "8" smd roundrect (at 1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e52dda6d-e22a-4a26-989c-4f6d09be209c))
-  (pad "9" smd roundrect (at 2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a51eb0f8-dab8-466d-bb0c-54b17f440289))
-  (pad "10" smd roundrect (at 3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3a483134-7d8a-4507-9ead-2b957f9e4c62))
-  (pad "11" smd roundrect (at 4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bd8a2665-2947-4f1f-9866-d9ff71a6db2e))
-  (pad "12" smd roundrect (at 5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c186d0df-c352-4846-bb27-4dbf980e8669))
-  (pad "13" smd roundrect (at 6 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c08729f6-7597-4d17-bf0a-3f961d91354c))
-  (pad "MP" smd roundrect (at -7.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp c604c335-0c0a-4b10-9e50-84587000e4e8))
-  (pad "MP" smd roundrect (at 7.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp ec057b02-1d4a-4008-aa26-e74ee153ba88))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM13B-SRSS-TB_1x13-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal.kicad_mod
index b0f01ec4f..50e6ebfd4 100644
--- a/Connector_JST.pretty/JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,54 +1,66 @@
-(footprint "JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM14B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp deb6a29f-a82d-48da-9723-12339d9a4ba8)
   )
-  (fp_text value "JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d0568ba0-0d18-4f1e-9839-9b4025e0f30e)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -8 -1.675) (end 8 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.11 0.715) (end -8.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.11 -1.785) (end -7.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.06 -1.785) (end -7.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.11 0.715) (end 8.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.11 -1.785) (end 7.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.94 2.685) (end 6.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8 2.575) (end 8 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 -1.675) (end -8 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 -1.675) (end 8 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.9 -3.28) (end -8.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.9 3.28) (end 8.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.9 3.28) (end 8.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.9 -3.28) (end -8.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7 -1.675) (end -6.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.967893) (end -6 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 5.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 6.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e5977c3c-4ca4-4c6f-9b56-67760384545f)
   )
-  (fp_line (start -7.06 -1.785) (end -7.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 362aa9ae-eb40-4b51-bb85-d8479e04a723))
-  (fp_line (start 8.11 0.715) (end 8.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 5b61cd79-e55b-40f5-947d-f40a0432c1d4))
-  (fp_line (start -6.94 2.685) (end 6.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp 6cc1e655-591d-4ee0-afde-224e54d69338))
-  (fp_line (start -8.11 -1.785) (end -7.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 8b6588a6-8743-4461-ba77-a87d157abbc7))
-  (fp_line (start -8.11 0.715) (end -8.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp b726c326-291a-4d3a-b5a6-59e1a4cb0916))
-  (fp_line (start 8.11 -1.785) (end 7.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp bfbc74ab-4d76-4a6f-bf7a-1ac9b67873de))
-  (fp_line (start -8.9 3.28) (end 8.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 6e1d2898-9dfb-4fec-83e3-472ee6aa0203))
-  (fp_line (start 8.9 3.28) (end 8.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 95db693a-73e3-41bb-b7de-9d826deeee65))
-  (fp_line (start 8.9 -3.28) (end -8.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 9bce0e69-7837-4bad-9a53-4c05dba708ac))
-  (fp_line (start -8.9 -3.28) (end -8.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp cc6f2a1a-55b5-4ca6-ad54-930930b4081c))
-  (fp_line (start -8 -1.675) (end 8 -1.675) (layer "F.Fab") (width 0.1) (tstamp 0c2c07aa-8997-4296-b498-93722a0660d4))
-  (fp_line (start -8 2.575) (end 8 2.575) (layer "F.Fab") (width 0.1) (tstamp 2552c5d7-b5d4-4d66-8c83-0bb828467162))
-  (fp_line (start -6.5 -0.967893) (end -6 -1.675) (layer "F.Fab") (width 0.1) (tstamp 47c3c438-6314-4060-bccd-5b61e1b15375))
-  (fp_line (start 8 -1.675) (end 8 2.575) (layer "F.Fab") (width 0.1) (tstamp c46a0178-6b45-4c42-8f4f-d828557a8a26))
-  (fp_line (start -8 -1.675) (end -8 2.575) (layer "F.Fab") (width 0.1) (tstamp e5cb103a-b492-4c08-9cf9-61fc27617c70))
-  (fp_line (start -7 -1.675) (end -6.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp ec5b9ae6-412b-4584-980d-49743dba65e8))
-  (pad "1" smd roundrect (at -6.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e9bd7c3-2fa3-4ce3-9506-6f6cbb3491b4))
-  (pad "2" smd roundrect (at -5.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 448d3a33-4899-49f8-86f1-8fa1f2eca60a))
-  (pad "3" smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 21bddd47-592e-4506-84e0-3903a86b6bae))
-  (pad "4" smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 65c54f3f-e7c1-4513-9710-9dc2a5fa0a30))
-  (pad "5" smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ac09e4bd-9fe9-4ba5-9131-050375fbbad1))
-  (pad "6" smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4bfeb2a6-8dc8-4485-babb-92bb23d874bd))
-  (pad "7" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2cb73b41-0e9e-45dd-93eb-837632c80269))
-  (pad "8" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d8090671-f7c0-4731-895b-d1b6a9893a03))
-  (pad "9" smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c7412554-c7cb-4aa5-bf3d-8c11bd18f7f1))
-  (pad "10" smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 68b4f46b-9433-4c1e-b9bd-252cf3b85cea))
-  (pad "11" smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e90faf34-46e3-4f14-a227-23252c319559))
-  (pad "12" smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e865dfd-5893-4765-9558-fbd75ab8396a))
-  (pad "13" smd roundrect (at 5.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 67aedb36-505c-4f22-868a-869b0f51d8a4))
-  (pad "14" smd roundrect (at 6.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a6905043-1d09-476f-9947-f82e739fa9e4))
-  (pad "MP" smd roundrect (at -7.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 2aa17cec-bf7c-44ed-8c80-552acba6250a))
-  (pad "MP" smd roundrect (at 7.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp c90bc124-6093-45c9-88fd-95ded46eeac6))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM14B-SRSS-TB_1x14-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal.kicad_mod
index 27ebc44a0..a75d43c91 100644
--- a/Connector_JST.pretty/JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,55 +1,67 @@
-(footprint "JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM15B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cc7e7b7e-08b3-4083-b5eb-111c1a1cf5e3)
   )
-  (fp_text value "JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d700a060-39ce-4c51-b5a7-b343ed18c663)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -8.5 -1.675) (end 8.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.61 0.715) (end -8.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.61 -1.785) (end -7.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.56 -1.785) (end -7.56 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 0.715) (end 8.61 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.61 -1.785) (end 7.56 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.44 2.685) (end 7.44 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.5 2.575) (end 8.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -1.675) (end -8.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 -1.675) (end 8.5 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.4 -3.28) (end -9.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.4 3.28) (end 9.4 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.4 3.28) (end 9.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.4 -3.28) (end -9.4 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.5 -1.675) (end -7 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -0.967893) (end -6.5 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 4 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 6 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 7 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 8.3 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3a242549-ac99-4d4a-bccc-7bb1c9a3fdcf)
   )
-  (fp_line (start -8.61 0.715) (end -8.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 1f470e59-45d7-4aa1-9d07-9ea657665ee4))
-  (fp_line (start -7.44 2.685) (end 7.44 2.685) (layer "F.SilkS") (width 0.12) (tstamp 35e883c0-6c22-4f35-b1a3-7317b9b22785))
-  (fp_line (start 8.61 -1.785) (end 7.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 3abb0466-3c1f-4590-bb84-dcf382c7a47a))
-  (fp_line (start -7.56 -1.785) (end -7.56 -2.775) (layer "F.SilkS") (width 0.12) (tstamp a84acf3e-046a-4c8c-96aa-3d3b395d7ef8))
-  (fp_line (start 8.61 0.715) (end 8.61 -1.785) (layer "F.SilkS") (width 0.12) (tstamp d6c3a3c4-9035-45ac-ae47-42235b3cb016))
-  (fp_line (start -8.61 -1.785) (end -7.56 -1.785) (layer "F.SilkS") (width 0.12) (tstamp ebb7340b-f65d-4a64-aaec-28f133b7d0a2))
-  (fp_line (start 9.4 3.28) (end 9.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 5fa09c08-87ae-4523-944d-d8f8f0ecfb7d))
-  (fp_line (start 9.4 -3.28) (end -9.4 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 6c2856b4-bd2e-45f1-8fff-a901ad54ce7d))
-  (fp_line (start -9.4 3.28) (end 9.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 9d7d0fd5-2888-42dc-9a1d-8a0d726686d5))
-  (fp_line (start -9.4 -3.28) (end -9.4 3.28) (layer "F.CrtYd") (width 0.05) (tstamp c7aa585b-5d28-4add-bb39-e853c19d3ed1))
-  (fp_line (start 8.5 -1.675) (end 8.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 0f385398-bd7b-4e40-ac62-c0658667267a))
-  (fp_line (start -8.5 -1.675) (end -8.5 2.575) (layer "F.Fab") (width 0.1) (tstamp 1b504786-92ab-47ed-8b3e-f326321d5b60))
-  (fp_line (start -8.5 2.575) (end 8.5 2.575) (layer "F.Fab") (width 0.1) (tstamp a87ddc00-aa88-4450-a089-a7fcae72ce8c))
-  (fp_line (start -8.5 -1.675) (end 8.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp c3b4aa42-607d-4f2e-ad0a-06707b7053e2))
-  (fp_line (start -7 -0.967893) (end -6.5 -1.675) (layer "F.Fab") (width 0.1) (tstamp e630ffd2-19e2-4452-970b-e11cd311761e))
-  (fp_line (start -7.5 -1.675) (end -7 -0.967893) (layer "F.Fab") (width 0.1) (tstamp f333a796-0f7a-4c72-8f5e-4864deb6f8e3))
-  (pad "1" smd roundrect (at -7 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c4603ebb-d5e9-406a-9e41-3d726d115340))
-  (pad "2" smd roundrect (at -6 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 61210e99-5134-45ae-8711-f0ee1d206eae))
-  (pad "3" smd roundrect (at -5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp da1c3496-c81e-47a1-b111-84f87a8c335e))
-  (pad "4" smd roundrect (at -4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8ae429d0-f17a-4826-91cb-527822791f8f))
-  (pad "5" smd roundrect (at -3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e9a7b7dd-646c-4561-a0f4-d48443136214))
-  (pad "6" smd roundrect (at -2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c050d903-3319-4955-855c-991868fba178))
-  (pad "7" smd roundrect (at -1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6ce38100-ed91-497c-a247-c8ba51445b41))
-  (pad "8" smd roundrect (at 0 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 57dd07e1-1e12-4dc9-8591-33047837f821))
-  (pad "9" smd roundrect (at 1 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f6cbb020-63b0-4571-b013-ad7e71154864))
-  (pad "10" smd roundrect (at 2 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a79e0fa7-1785-4b63-bfd6-47899b854be5))
-  (pad "11" smd roundrect (at 3 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0ddb875c-8169-472d-9cb6-2c0cc664bbb0))
-  (pad "12" smd roundrect (at 4 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c99597a9-91f0-44d0-932f-1f694a8ef1fa))
-  (pad "13" smd roundrect (at 5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6e9d891f-4be4-4cf9-9157-ea556f901479))
-  (pad "14" smd roundrect (at 6 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8eee62ca-2771-4664-a791-803096ceaebf))
-  (pad "15" smd roundrect (at 7 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fa4fc293-f865-4639-8e16-4ca1b0075844))
-  (pad "MP" smd roundrect (at -8.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 6a2e6a88-04b1-4dda-a856-8a3360ab2251))
-  (pad "MP" smd roundrect (at 8.3 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp f048a28e-3fb0-46ff-8319-71de0df64892))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM15B-SRSS-TB_1x15-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal.kicad_mod
index 41cbd241d..b5367a724 100644
--- a/Connector_JST.pretty/JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1,60 +1,72 @@
-(footprint "JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD87)
+(footprint JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SH series connector, SM20B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SH top entry")
+  (tags "connector JST SH horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -3.98) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -3.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a8be0649-ab9c-4e07-898a-32fabb7763bf)
   )
-  (fp_text value "JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal" (at 0 3.98) (layer "F.Fab")
+  (fp_text value JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal (at 0 3.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3ae05aff-f2a5-4989-bb36-fc969a737e44)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -11 -1.675) (end 11 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.11 0.715) (end -11.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.11 -1.785) (end -10.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.06 -1.785) (end -10.06 -2.775)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.11 0.715) (end 11.11 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.11 -1.785) (end 10.06 -1.785)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.94 2.685) (end 9.94 2.685)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11 2.575) (end 11 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11 -1.675) (end -11 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11 -1.675) (end 11 2.575)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.9 -3.28) (end -11.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.9 3.28) (end 11.9 3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.9 3.28) (end 11.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.9 -3.28) (end -11.9 -3.28)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10 -1.675) (end -9.5 -0.967893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.5 -0.967893) (end -9 -1.675)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -8.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -7.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -5.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 5.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 6.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 7.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 8.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 9.5 -2) (size 0.6 1.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 10.8 1.875) (size 1.2 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cebb70c5-c150-4dea-849d-260cb895de7b)
   )
-  (fp_line (start -11.11 -1.785) (end -10.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 22d91052-28cc-4ee6-a2e9-5f97e964716b))
-  (fp_line (start -9.94 2.685) (end 9.94 2.685) (layer "F.SilkS") (width 0.12) (tstamp 3658bf1c-c5dd-453d-bebd-0f99648171a2))
-  (fp_line (start -11.11 0.715) (end -11.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 533679e2-8138-4b6e-a80a-1cf417623c8e))
-  (fp_line (start 11.11 0.715) (end 11.11 -1.785) (layer "F.SilkS") (width 0.12) (tstamp 77e884e8-dfed-4c09-b848-414dc2553d6a))
-  (fp_line (start -10.06 -1.785) (end -10.06 -2.775) (layer "F.SilkS") (width 0.12) (tstamp 8c44902c-06dc-43f4-80c6-7f73f04ab82e))
-  (fp_line (start 11.11 -1.785) (end 10.06 -1.785) (layer "F.SilkS") (width 0.12) (tstamp cb30d7d0-0174-4ed7-af42-0cec3ff8f6b1))
-  (fp_line (start 11.9 -3.28) (end -11.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 0677c330-3844-46ac-9625-23359507b89f))
-  (fp_line (start -11.9 3.28) (end 11.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp 3181f490-aeac-4038-8bae-744a497d725d))
-  (fp_line (start 11.9 3.28) (end 11.9 -3.28) (layer "F.CrtYd") (width 0.05) (tstamp 8fc940c6-07a2-416a-9d90-ef13a8e5798e))
-  (fp_line (start -11.9 -3.28) (end -11.9 3.28) (layer "F.CrtYd") (width 0.05) (tstamp dec7d285-9e4e-4d3d-8bde-f85e72651ba5))
-  (fp_line (start -9.5 -0.967893) (end -9 -1.675) (layer "F.Fab") (width 0.1) (tstamp 269395be-e5f0-442b-b67a-36ab9b1ff187))
-  (fp_line (start -10 -1.675) (end -9.5 -0.967893) (layer "F.Fab") (width 0.1) (tstamp 401b17d7-f279-429b-84e6-64e3ea2455e1))
-  (fp_line (start -11 -1.675) (end -11 2.575) (layer "F.Fab") (width 0.1) (tstamp 6cc5d3a3-6016-44f5-a300-005586d73851))
-  (fp_line (start -11 -1.675) (end 11 -1.675) (layer "F.Fab") (width 0.1) (tstamp a47cbe11-57a4-475e-a021-054ff7c71e02))
-  (fp_line (start 11 -1.675) (end 11 2.575) (layer "F.Fab") (width 0.1) (tstamp e7e914d3-b663-44ac-9365-ccb8d294a820))
-  (fp_line (start -11 2.575) (end 11 2.575) (layer "F.Fab") (width 0.1) (tstamp f9dcca6b-95a1-4c84-8d11-9b852b541664))
-  (pad "1" smd roundrect (at -9.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 45c98a75-8f97-47d5-90da-ed5033b5f64a))
-  (pad "2" smd roundrect (at -8.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 94d9f127-753f-4141-8c44-69bc42136542))
-  (pad "3" smd roundrect (at -7.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 19702cba-e973-4337-8432-2c49be6ece17))
-  (pad "4" smd roundrect (at -6.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5f48095a-4110-4f67-98ad-88edc2444f70))
-  (pad "5" smd roundrect (at -5.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4762b326-f336-45a8-a165-c919b4cbc0a1))
-  (pad "6" smd roundrect (at -4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5179ed10-9d4d-4f69-a749-cd9d19e295a0))
-  (pad "7" smd roundrect (at -3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c3d4c0e9-ae91-4755-9b00-eecde62ce7bb))
-  (pad "8" smd roundrect (at -2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 88660533-2011-43bc-a51a-0a964160819e))
-  (pad "9" smd roundrect (at -1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1a6f24cf-ce2d-4f5a-b870-1d88912c387e))
-  (pad "10" smd roundrect (at -0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 79141d2b-7895-4533-83f1-7f0bdce3a36b))
-  (pad "11" smd roundrect (at 0.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp de3df834-cd39-423b-a57e-7a119699e84d))
-  (pad "12" smd roundrect (at 1.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00aa3872-c902-4e56-b4bb-456382d554fd))
-  (pad "13" smd roundrect (at 2.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fadbfc0b-285b-4e7d-a506-dbf2a6a4e843))
-  (pad "14" smd roundrect (at 3.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 68cf0136-bd1a-48bc-b853-c4ed029b973c))
-  (pad "15" smd roundrect (at 4.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6c2c9f33-74c4-4405-8f90-66332e27608f))
-  (pad "16" smd roundrect (at 5.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 826af0e7-ec9a-4188-a0d8-9dab2ae5062d))
-  (pad "17" smd roundrect (at 6.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fbfef325-425e-46b8-9501-4939b01300ce))
-  (pad "18" smd roundrect (at 7.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 56875a72-f40a-44ea-be6e-ffc689a1ba21))
-  (pad "19" smd roundrect (at 8.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a493cba6-205c-493d-8908-1ba3925030b7))
-  (pad "20" smd roundrect (at 9.5 -2) (size 0.6 1.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e56f650c-b3d5-4108-8240-8369c34846a2))
-  (pad "MP" smd roundrect (at 10.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 19821bf0-8ec8-4ac9-89eb-62e0bd925eb9))
-  (pad "MP" smd roundrect (at -10.8 1.875) (size 1.2 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp cc7b47c1-4e95-4833-b928-6e4786cfa46d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SH_SM20B-SRSS-TB_1x20-1MP_P1.00mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical.kicad_mod
index 334b0457e..edb40d37c 100644
--- a/Connector_JST.pretty/JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,42 +1,54 @@
-(footprint "JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM02B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e1bb260e-29aa-4c12-8f22-25a6befb8bcb)
   )
-  (fp_text value "JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2ea43d08-884e-4868-b054-64653fe653b9)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -1.9 0.9) (end 1.9 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.01 0.56) (end -2.01 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.01 1.01) (end -0.91 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.91 1.01) (end -0.91 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.01 0.56) (end 2.01 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.01 1.01) (end 0.91 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.84 -1.21) (end 0.84 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.9 -1.1) (end 1.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.9 0.9) (end -1.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.9 0.9) (end 1.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.8 -1.9) (end -2.8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.8 1.9) (end 2.8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.8 1.9) (end 2.8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.8 -1.9) (end -2.8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -0.9 0.9) (end -0.4 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.4 0.192893) (end 0.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.7 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 1.7 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 0.95 0.95) (thickness 0.14)))
-    (tstamp 27558624-7023-4a6c-a4df-65e570cfcc5d)
   )
-  (fp_line (start -0.84 -1.21) (end 0.84 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 3e19ad15-d98c-441c-a56a-8957ae1df8e6))
-  (fp_line (start 2.01 0.56) (end 2.01 1.01) (layer "F.SilkS") (width 0.12) (tstamp 62d7f913-5c53-4376-bb2c-ca776748a60d))
-  (fp_line (start -0.91 1.01) (end -0.91 1.4) (layer "F.SilkS") (width 0.12) (tstamp 657176ad-4627-4b95-b28e-9606b6870160))
-  (fp_line (start 2.01 1.01) (end 0.91 1.01) (layer "F.SilkS") (width 0.12) (tstamp 96fb20cb-753b-4475-86e5-2e1153bdd452))
-  (fp_line (start -2.01 1.01) (end -0.91 1.01) (layer "F.SilkS") (width 0.12) (tstamp f0367d3d-e82c-4099-b93a-aecf31d5a24b))
-  (fp_line (start -2.01 0.56) (end -2.01 1.01) (layer "F.SilkS") (width 0.12) (tstamp fe3e4e49-faa3-4f7a-9b2a-a5f4f2d274a2))
-  (fp_line (start -2.8 1.9) (end 2.8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 02230d32-8042-4d16-a4f1-fd0a67fdb82a))
-  (fp_line (start 2.8 1.9) (end 2.8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 524d649e-6a04-4843-9d48-7952593ff7d5))
-  (fp_line (start 2.8 -1.9) (end -2.8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 61e17dc9-1fad-45ac-a771-99c01c19636f))
-  (fp_line (start -2.8 -1.9) (end -2.8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 81a13bee-5aab-45b9-b23f-4cf37844d9ea))
-  (fp_line (start 1.9 0.9) (end 1.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 18dcc3e9-86d5-4785-967c-7b4a056245d0))
-  (fp_line (start -1.9 -1.1) (end 1.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 3ce36a81-04d0-4f83-a241-c4bfa18e45dc))
-  (fp_line (start -1.9 0.9) (end 1.9 0.9) (layer "F.Fab") (width 0.1) (tstamp 9892766d-b450-4255-bbd0-24199c4de5f3))
-  (fp_line (start -0.4 0.192893) (end 0.1 0.9) (layer "F.Fab") (width 0.1) (tstamp baf55a94-23c2-4dee-8525-0b6543b21c3d))
-  (fp_line (start -1.9 0.9) (end -1.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp bb686e0e-fbdb-4ea4-8ab5-4587017b93e9))
-  (fp_line (start -0.9 0.9) (end -0.4 0.192893) (layer "F.Fab") (width 0.1) (tstamp f525521a-7b9c-4b6f-b573-c7db77b21123))
-  (pad "1" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 63bb07a1-ba56-4dfd-89f5-46f892962f38))
-  (pad "2" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3baca53b-3688-4d04-af8d-0fb15a16429b))
-  (pad "MP" smd roundrect (at -1.7 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 4379b14f-fb99-40e6-8802-95fc0a2b1aac))
-  (pad "MP" smd roundrect (at 1.7 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 80998dcb-94e0-4828-9990-d03140245d1e))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM02B-SURS-TF_1x02-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical.kicad_mod
index d6007f6f1..a14b16471 100644
--- a/Connector_JST.pretty/JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,43 +1,55 @@
-(footprint "JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM03B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ffcfe0ed-e55d-4506-98b3-57485a191c16)
   )
-  (fp_text value "JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c68469bc-6348-4702-9724-746b51d914d3)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -2.3 0.9) (end 2.3 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.41 0.56) (end -2.41 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.41 1.01) (end -1.31 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.31 1.01) (end -1.31 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.41 0.56) (end 2.41 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.41 1.01) (end 1.31 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.24 -1.21) (end 1.24 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.3 -1.1) (end 2.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.3 0.9) (end -2.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.3 0.9) (end 2.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.2 -1.9) (end -3.2 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.2 1.9) (end 3.2 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.2 1.9) (end 3.2 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.2 -1.9) (end -3.2 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.3 0.9) (end -0.8 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.8 0.192893) (end -0.3 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.1 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.1 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f904007e-0b11-4d76-bcf0-061831a5bd49)
   )
-  (fp_line (start 2.41 1.01) (end 1.31 1.01) (layer "F.SilkS") (width 0.12) (tstamp 0fec0b8f-d896-47e4-a8f3-2e24e7e7baa0))
-  (fp_line (start -1.24 -1.21) (end 1.24 -1.21) (layer "F.SilkS") (width 0.12) (tstamp a0c90d19-bf67-44e4-bdb7-c8ebf24d6fc9))
-  (fp_line (start -2.41 0.56) (end -2.41 1.01) (layer "F.SilkS") (width 0.12) (tstamp aa3e0e5f-978a-4a45-91b2-a9c0725e495a))
-  (fp_line (start -2.41 1.01) (end -1.31 1.01) (layer "F.SilkS") (width 0.12) (tstamp aac45057-1218-4b48-bea1-de7118c2267c))
-  (fp_line (start -1.31 1.01) (end -1.31 1.4) (layer "F.SilkS") (width 0.12) (tstamp b50d5942-bd3c-41f3-96bd-dd526008ee16))
-  (fp_line (start 2.41 0.56) (end 2.41 1.01) (layer "F.SilkS") (width 0.12) (tstamp d2086022-848e-4da5-b8a9-3b7d9e7a3f8c))
-  (fp_line (start 3.2 1.9) (end 3.2 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 43f35075-fa46-4a79-9d66-54b293cf0248))
-  (fp_line (start -3.2 1.9) (end 3.2 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 7557eadb-d642-49ff-9bf7-95af506a876a))
-  (fp_line (start 3.2 -1.9) (end -3.2 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 80e3bbcb-ebb5-4a50-adc0-c2428f76e9ee))
-  (fp_line (start -3.2 -1.9) (end -3.2 1.9) (layer "F.CrtYd") (width 0.05) (tstamp c7bda4cc-80cb-490a-bc72-32e7e2dc126e))
-  (fp_line (start -1.3 0.9) (end -0.8 0.192893) (layer "F.Fab") (width 0.1) (tstamp 12a4e4fe-c85b-4bc0-ba7d-310e05750f66))
-  (fp_line (start 2.3 0.9) (end 2.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp 2382640e-f2e2-427a-8f3f-717b5119cb3f))
-  (fp_line (start -2.3 0.9) (end 2.3 0.9) (layer "F.Fab") (width 0.1) (tstamp 5a7385e1-c037-4be3-bcb7-05e967203af4))
-  (fp_line (start -2.3 -1.1) (end 2.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp 8483490c-cf0b-474c-953a-cef56980fc6e))
-  (fp_line (start -2.3 0.9) (end -2.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp 87382a04-9179-4c58-a303-e1dfa04be644))
-  (fp_line (start -0.8 0.192893) (end -0.3 0.9) (layer "F.Fab") (width 0.1) (tstamp c5a5d94d-052a-4025-81e8-727063b2ca96))
-  (pad "1" smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f59456b0-5ac5-415a-9c2e-8ff819b7e12c))
-  (pad "2" smd roundrect (at 0 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8f2476a1-f46f-4ca8-94f8-a5e103dd8d85))
-  (pad "3" smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 08070fd9-61e1-4512-ab7b-e6019e3dd370))
-  (pad "MP" smd roundrect (at 2.1 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 3936c4e7-6dc9-4e3c-8480-da3352d5c499))
-  (pad "MP" smd roundrect (at -2.1 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 59cea34d-e180-4bb9-81bf-25f2830ed6e4))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM03B-SURS-TF_1x03-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical.kicad_mod
index fa596101f..9af6de331 100644
--- a/Connector_JST.pretty/JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,44 +1,56 @@
-(footprint "JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM04B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1f3f605d-9b71-4066-97e4-9075e0ad3337)
   )
-  (fp_text value "JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ac45c53f-6aa3-436d-8e41-95275f36b313)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -2.7 0.9) (end 2.7 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.81 0.56) (end -2.81 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.81 1.01) (end -1.71 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.71 1.01) (end -1.71 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.81 0.56) (end 2.81 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.81 1.01) (end 1.71 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.64 -1.21) (end 1.64 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.7 -1.1) (end 2.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.7 0.9) (end -2.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.7 0.9) (end 2.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.6 -1.9) (end -3.6 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.6 1.9) (end 3.6 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.6 1.9) (end 3.6 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.6 -1.9) (end -3.6 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.7 0.9) (end -1.2 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.2 0.192893) (end -0.7 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.5 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.5 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7e88ea34-f526-41f7-819c-f134bb53964c)
   )
-  (fp_line (start -2.81 0.56) (end -2.81 1.01) (layer "F.SilkS") (width 0.12) (tstamp 2fa17abe-13b8-4911-a014-d5a33ca83b40))
-  (fp_line (start -1.64 -1.21) (end 1.64 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 33ef6e22-98d9-4d88-8c7c-2d43cedde4e9))
-  (fp_line (start -1.71 1.01) (end -1.71 1.4) (layer "F.SilkS") (width 0.12) (tstamp 43c452e2-d28a-40d0-b4dd-0f69c818a036))
-  (fp_line (start 2.81 0.56) (end 2.81 1.01) (layer "F.SilkS") (width 0.12) (tstamp 6beb81ae-040c-4d60-a9e7-384701edb544))
-  (fp_line (start -2.81 1.01) (end -1.71 1.01) (layer "F.SilkS") (width 0.12) (tstamp 762eee78-23f3-4f56-998f-d7fc4d33247f))
-  (fp_line (start 2.81 1.01) (end 1.71 1.01) (layer "F.SilkS") (width 0.12) (tstamp a7c448e9-7081-465d-8d12-ec2093e3ab9a))
-  (fp_line (start -3.6 1.9) (end 3.6 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 1295442f-c380-467c-ac42-f27915d6cc9c))
-  (fp_line (start 3.6 1.9) (end 3.6 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 7dabbf85-5724-46e0-8f13-6162cc07991a))
-  (fp_line (start 3.6 -1.9) (end -3.6 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp c17a9a9b-cae7-4014-93cd-214a11b01874))
-  (fp_line (start -3.6 -1.9) (end -3.6 1.9) (layer "F.CrtYd") (width 0.05) (tstamp f5dbf818-d5e1-4376-b9d9-54454cff37ee))
-  (fp_line (start 2.7 0.9) (end 2.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp 0d1ab084-ab01-46dc-88db-bf5bd95da669))
-  (fp_line (start -1.7 0.9) (end -1.2 0.192893) (layer "F.Fab") (width 0.1) (tstamp 297d16e0-ebea-4228-a669-e45ba91307c3))
-  (fp_line (start -2.7 0.9) (end 2.7 0.9) (layer "F.Fab") (width 0.1) (tstamp 476d9823-a0d6-4727-a239-0f96f587ebbf))
-  (fp_line (start -2.7 0.9) (end -2.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp cdce7605-3683-4b1c-a1f8-66b7f75918d5))
-  (fp_line (start -2.7 -1.1) (end 2.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp dab1a84d-a41b-45a5-ac07-b47290324138))
-  (fp_line (start -1.2 0.192893) (end -0.7 0.9) (layer "F.Fab") (width 0.1) (tstamp f5c8e7bf-ed27-494d-b7eb-e43d32dd222c))
-  (pad "1" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2ab1a7bb-d1ae-4709-984c-7e2bc059be69))
-  (pad "2" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 450163b7-1081-4ba0-8577-31182b6a6241))
-  (pad "3" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bdec35cb-1ef2-4268-8281-ab7e5ffdcbf8))
-  (pad "4" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0cac7990-3c85-4162-8b5b-6e107303c11a))
-  (pad "MP" smd roundrect (at -2.5 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp bd1930f0-6141-422b-8211-9cd683e9a735))
-  (pad "MP" smd roundrect (at 2.5 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp d6020f0b-f30d-42be-95ce-984d149fe2b0))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM04B-SURS-TF_1x04-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical.kicad_mod
index e1a075847..dde43ebd6 100644
--- a/Connector_JST.pretty/JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,45 +1,57 @@
-(footprint "JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM05B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 92795142-c166-4609-b969-22f855f35ff7)
   )
-  (fp_text value "JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0dc122e8-4069-4725-a2e8-7a397095af3b)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -3.1 0.9) (end 3.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.21 0.56) (end -3.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.21 1.01) (end -2.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.11 1.01) (end -2.11 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.21 0.56) (end 3.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.21 1.01) (end 2.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.04 -1.21) (end 2.04 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.1 -1.1) (end 3.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.1 0.9) (end -3.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.1 0.9) (end 3.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -1.9) (end -4 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4 1.9) (end 4 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4 1.9) (end 4 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4 -1.9) (end -4 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.1 0.9) (end -1.6 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.6 0.192893) (end -1.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 32dadeaa-da70-4aa6-a618-f676af55ffc4)
   )
-  (fp_line (start -3.21 1.01) (end -2.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp 0d8d648f-bc23-4687-a2f7-5dc5c04206c5))
-  (fp_line (start -2.11 1.01) (end -2.11 1.4) (layer "F.SilkS") (width 0.12) (tstamp 2084feb6-f834-4506-a6b0-c18fbb74c233))
-  (fp_line (start 3.21 0.56) (end 3.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp 48412e40-394b-4651-b4a7-984cc9a35215))
-  (fp_line (start -2.04 -1.21) (end 2.04 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 7811052d-c7c7-407c-8423-f83f5d538c05))
-  (fp_line (start -3.21 0.56) (end -3.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp e36dc1d6-a780-4db0-9aa5-49090b8a4c76))
-  (fp_line (start 3.21 1.01) (end 2.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp f1a8d5ba-4694-4509-a86b-23cb930862ac))
-  (fp_line (start 4 -1.9) (end -4 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 37073040-e9b9-4bc6-a6c2-f6dd06021405))
-  (fp_line (start 4 1.9) (end 4 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 3b2083f1-e356-4283-a230-13b7da1e232f))
-  (fp_line (start -4 -1.9) (end -4 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 67202a7c-21e7-4121-a852-11741d9f20dc))
-  (fp_line (start -4 1.9) (end 4 1.9) (layer "F.CrtYd") (width 0.05) (tstamp ff4d0ce8-4270-46af-8681-a76c8444bbe4))
-  (fp_line (start -2.1 0.9) (end -1.6 0.192893) (layer "F.Fab") (width 0.1) (tstamp 07cc19b8-dc15-4ec3-98bd-fc0cb7267148))
-  (fp_line (start -3.1 0.9) (end -3.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 14543960-3ad5-4152-8ba1-1b84d15c018f))
-  (fp_line (start -1.6 0.192893) (end -1.1 0.9) (layer "F.Fab") (width 0.1) (tstamp 82b2d7ed-c63f-4fe7-8134-3615248721cb))
-  (fp_line (start -3.1 -1.1) (end 3.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 8bf114b1-9eff-4928-9f15-e27429bc1d36))
-  (fp_line (start -3.1 0.9) (end 3.1 0.9) (layer "F.Fab") (width 0.1) (tstamp 9f66c45b-5681-4b91-95ad-eaf5a0830036))
-  (fp_line (start 3.1 0.9) (end 3.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp a9e86c1a-eddc-4c0f-8504-f06718c794a4))
-  (pad "1" smd roundrect (at -1.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bef5d769-7090-48da-a147-20c0b01f10f7))
-  (pad "2" smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8eedfbb0-d45a-4346-b649-12b028d15ddc))
-  (pad "3" smd roundrect (at 0 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 63304796-0ee9-4d26-9058-25b8e1fc71da))
-  (pad "4" smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 12df842c-927f-4526-980a-87f778e09ad4))
-  (pad "5" smd roundrect (at 1.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ab512065-dd20-4f8a-a9f9-7a177df79a7a))
-  (pad "MP" smd roundrect (at -2.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 60e2004f-841f-4025-b526-f9dfaffb1159))
-  (pad "MP" smd roundrect (at 2.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp d52501d3-148b-40e3-8710-66440050db27))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM05B-SURS-TF_1x05-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical.kicad_mod
index 9c7950bb9..b4d0a800d 100644
--- a/Connector_JST.pretty/JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,46 +1,58 @@
-(footprint "JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM06B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e83101b1-a06b-452b-8b09-95e58a540554)
   )
-  (fp_text value "JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8118fc8a-2838-423f-b4a3-d1671ec8565b)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -3.5 0.9) (end 3.5 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.61 0.56) (end -3.61 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.61 1.01) (end -2.51 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.51 1.01) (end -2.51 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 0.56) (end 3.61 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 1.01) (end 2.51 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.44 -1.21) (end 2.44 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.5 -1.1) (end 3.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0.9) (end -3.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0.9) (end 3.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 -1.9) (end -4.4 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.4 1.9) (end 4.4 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 1.9) (end 4.4 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 -1.9) (end -4.4 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.5 0.9) (end -2 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0.192893) (end -1.5 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.3 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 3.3 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7b98cd10-d46b-4e62-978a-d6f366b61b0b)
   )
-  (fp_line (start 3.61 0.56) (end 3.61 1.01) (layer "F.SilkS") (width 0.12) (tstamp 01b11ed4-89ef-422e-a822-08cb21e258b1))
-  (fp_line (start -2.51 1.01) (end -2.51 1.4) (layer "F.SilkS") (width 0.12) (tstamp 69499775-9948-4031-b76f-1623d53c4fcc))
-  (fp_line (start 3.61 1.01) (end 2.51 1.01) (layer "F.SilkS") (width 0.12) (tstamp cf122346-4574-4ca0-bb0c-a9b2ef976aad))
-  (fp_line (start -3.61 1.01) (end -2.51 1.01) (layer "F.SilkS") (width 0.12) (tstamp e915ac11-5aa6-4e4d-9b4d-de50f6ad539d))
-  (fp_line (start -3.61 0.56) (end -3.61 1.01) (layer "F.SilkS") (width 0.12) (tstamp e9878afe-bf3f-459c-99a4-2db385f45576))
-  (fp_line (start -2.44 -1.21) (end 2.44 -1.21) (layer "F.SilkS") (width 0.12) (tstamp faa1096f-4ade-42e8-b7ed-b23872cbd5a1))
-  (fp_line (start -4.4 -1.9) (end -4.4 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 212c5e4d-4488-4eae-87dc-91a8998a5607))
-  (fp_line (start -4.4 1.9) (end 4.4 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 262d6802-1d77-4c05-92ea-cf321320e004))
-  (fp_line (start 4.4 1.9) (end 4.4 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp a927d63f-a950-4e85-8df7-03e5576eaf11))
-  (fp_line (start 4.4 -1.9) (end -4.4 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp a9e3dbfd-244f-4180-aad1-60c8f330f3a9))
-  (fp_line (start -3.5 0.9) (end -3.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp 12016e10-08ee-44c8-b213-e9093ba92501))
-  (fp_line (start -2.5 0.9) (end -2 0.192893) (layer "F.Fab") (width 0.1) (tstamp 54626816-6d32-48d6-aef0-2a5a8c145ea4))
-  (fp_line (start -2 0.192893) (end -1.5 0.9) (layer "F.Fab") (width 0.1) (tstamp aad2ef4d-f7bf-4096-b89e-cb4f32a81aa3))
-  (fp_line (start -3.5 0.9) (end 3.5 0.9) (layer "F.Fab") (width 0.1) (tstamp d245768a-83ea-49c3-ba97-3305d8277504))
-  (fp_line (start -3.5 -1.1) (end 3.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp df64b6ed-f7b3-49ae-94e3-fca62232dae6))
-  (fp_line (start 3.5 0.9) (end 3.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp f3a73319-3026-41d9-8292-96b842bec823))
-  (pad "1" smd roundrect (at -2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp da1d3955-67fc-49d8-b5dd-0b613d81969c))
-  (pad "2" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a6ebfa70-ebba-4427-9d59-b3e236050c4e))
-  (pad "3" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 37425019-68d2-4c44-918f-4db9b59ece3f))
-  (pad "4" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 92ef1dfe-e574-4246-b97c-3aa795f727aa))
-  (pad "5" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c06d1891-e093-4ae4-8eba-de1733d90929))
-  (pad "6" smd roundrect (at 2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9b3de6e4-e676-4db5-a7f5-c4312b6c7541))
-  (pad "MP" smd roundrect (at 3.3 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 727da848-edc5-4354-bdd6-0b3d4ace9bf1))
-  (pad "MP" smd roundrect (at -3.3 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp e1b29caf-98cb-4815-a3fd-91662c8a353f))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM06B-SURS-TF_1x06-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical.kicad_mod
index d0ceeeb0a..c368020aa 100644
--- a/Connector_JST.pretty/JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,48 +1,60 @@
-(footprint "JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM08B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1d072189-df22-4f26-be60-53843ac8b66d)
   )
-  (fp_text value "JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c622803c-9a20-4b4e-a75c-ad23fde17f6e)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -4.3 0.9) (end 4.3 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.41 0.56) (end -4.41 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.41 1.01) (end -3.31 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.31 1.01) (end -3.31 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.41 0.56) (end 4.41 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.41 1.01) (end 3.31 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.24 -1.21) (end 3.24 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.3 -1.1) (end 4.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.3 0.9) (end -4.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.3 0.9) (end 4.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.2 -1.9) (end -5.2 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.2 1.9) (end 5.2 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.2 1.9) (end 5.2 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.2 -1.9) (end -5.2 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.3 0.9) (end -2.8 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.8 0.192893) (end -2.3 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.1 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.1 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0b0d8b9c-5fa3-4364-9da8-8ec73c4162ce)
   )
-  (fp_line (start -4.41 0.56) (end -4.41 1.01) (layer "F.SilkS") (width 0.12) (tstamp 1c3451b2-96ca-4aa2-8fae-578615a2d8df))
-  (fp_line (start -3.24 -1.21) (end 3.24 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 1c7615d0-6f72-48e0-86da-506bf6f43a4f))
-  (fp_line (start -4.41 1.01) (end -3.31 1.01) (layer "F.SilkS") (width 0.12) (tstamp 2b703694-dc9a-419c-b72f-cfc3f8f6caa8))
-  (fp_line (start 4.41 1.01) (end 3.31 1.01) (layer "F.SilkS") (width 0.12) (tstamp 86dca92c-22fd-4bae-a6b8-58fc2802d2a2))
-  (fp_line (start -3.31 1.01) (end -3.31 1.4) (layer "F.SilkS") (width 0.12) (tstamp cb383407-dae7-4053-b125-867e39606426))
-  (fp_line (start 4.41 0.56) (end 4.41 1.01) (layer "F.SilkS") (width 0.12) (tstamp ea08d2ef-7038-4fe1-bedc-78f78bcb5fd2))
-  (fp_line (start -5.2 1.9) (end 5.2 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 02818143-9e9c-4b57-a79e-fb67708dd30c))
-  (fp_line (start 5.2 -1.9) (end -5.2 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 6b4009cb-2bf8-41e6-9159-064f311391be))
-  (fp_line (start 5.2 1.9) (end 5.2 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp aee76239-658d-4728-8725-b0893c30f14f))
-  (fp_line (start -5.2 -1.9) (end -5.2 1.9) (layer "F.CrtYd") (width 0.05) (tstamp f9128dd7-d538-45ce-a73f-825014855fdb))
-  (fp_line (start -4.3 0.9) (end 4.3 0.9) (layer "F.Fab") (width 0.1) (tstamp 1642d275-19b7-40cc-be3c-d8fbb8761f76))
-  (fp_line (start -2.8 0.192893) (end -2.3 0.9) (layer "F.Fab") (width 0.1) (tstamp 3e4306a6-efaa-419c-a2ce-d14f416e0bd2))
-  (fp_line (start -4.3 -1.1) (end 4.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp 615dd57f-f9c8-4813-b614-4e75783f710b))
-  (fp_line (start -4.3 0.9) (end -4.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp 7d14e404-c985-4a04-b314-79103e99d299))
-  (fp_line (start 4.3 0.9) (end 4.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp 9c1b9de9-38bd-4c2f-88a1-12589af117c0))
-  (fp_line (start -3.3 0.9) (end -2.8 0.192893) (layer "F.Fab") (width 0.1) (tstamp c665859c-a478-4b3f-b958-2f5e557c4723))
-  (pad "1" smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ca41ce77-e243-4004-96a6-a6c70210f482))
-  (pad "2" smd roundrect (at -2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ce646d0b-8b6a-481a-adb5-d85500577f8a))
-  (pad "3" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0766d698-cdd5-4021-8d90-a8677db6d599))
-  (pad "4" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 59d17bd1-9b9b-4413-a64d-e2b9522ee64c))
-  (pad "5" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bcc103ac-51a3-470b-ba0c-675e0788f5f1))
-  (pad "6" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 06208ee2-a286-4c4e-8fbd-032dd2337ac5))
-  (pad "7" smd roundrect (at 2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f9615f12-0bee-4d4d-8de2-9e1a8528d858))
-  (pad "8" smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 825a05b5-5f46-4ec0-a6b0-f70d170865e1))
-  (pad "MP" smd roundrect (at -4.1 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 033ec2c2-0a04-4cf6-a1ce-0784466601d6))
-  (pad "MP" smd roundrect (at 4.1 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp ae41673c-67f7-48ec-bb76-09a6a6fe3f74))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM08B-SURS-TF_1x08-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical.kicad_mod
index 95efce5be..f520c5dbb 100644
--- a/Connector_JST.pretty/JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,50 +1,62 @@
-(footprint "JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM10B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 22b3ce64-d93e-4133-8107-3726a715b420)
   )
-  (fp_text value "JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e11adb33-4bfe-4c3a-8df1-0799ee5b84d9)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -5.1 0.9) (end 5.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.21 0.56) (end -5.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.21 1.01) (end -4.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.11 1.01) (end -4.11 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.21 0.56) (end 5.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.21 1.01) (end 4.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.04 -1.21) (end 4.04 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.1 -1.1) (end 5.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.1 0.9) (end -5.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.1 0.9) (end 5.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -1.9) (end -6 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6 1.9) (end 6 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6 1.9) (end 6 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6 -1.9) (end -6 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.1 0.9) (end -3.6 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.6 0.192893) (end -3.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 661ae778-43a0-485b-88ca-d6aa8bd02491)
   )
-  (fp_line (start 5.21 0.56) (end 5.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp 1acce0ec-3b60-406f-8fa4-a3fdd2cd5b25))
-  (fp_line (start 5.21 1.01) (end 4.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp 2606b9d7-6201-468e-aa01-5b1d622865be))
-  (fp_line (start -5.21 1.01) (end -4.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp 351d7b46-1057-4157-a45a-cbeebc4ebd39))
-  (fp_line (start -4.04 -1.21) (end 4.04 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 4452fb22-3722-43c4-acb9-de2a9bbf0c74))
-  (fp_line (start -5.21 0.56) (end -5.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp 908bf38c-9902-453e-b527-fbbea302f290))
-  (fp_line (start -4.11 1.01) (end -4.11 1.4) (layer "F.SilkS") (width 0.12) (tstamp c3007b54-bc0f-405e-ad67-7eb5a8f73854))
-  (fp_line (start -6 1.9) (end 6 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 4475b557-496a-4503-bd28-d1545d878ef6))
-  (fp_line (start 6 -1.9) (end -6 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 9ed87632-c7e3-4db4-a754-7599f6dd58f4))
-  (fp_line (start 6 1.9) (end 6 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp d46c26ea-e7c5-49c9-a30e-29bd00e18180))
-  (fp_line (start -6 -1.9) (end -6 1.9) (layer "F.CrtYd") (width 0.05) (tstamp e055126b-e020-4bd7-b972-93fa4d7feca7))
-  (fp_line (start -5.1 -1.1) (end 5.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 10c8e3bb-2a15-49e4-99ce-372cd747a638))
-  (fp_line (start -4.1 0.9) (end -3.6 0.192893) (layer "F.Fab") (width 0.1) (tstamp 30be65cf-6564-4811-9a58-6c98b4ab3d0e))
-  (fp_line (start 5.1 0.9) (end 5.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 3851e0b9-fc58-480e-96ba-95723afc0798))
-  (fp_line (start -5.1 0.9) (end -5.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp bf7c5f5f-91b9-46bd-b9cf-045e6f1b386e))
-  (fp_line (start -3.6 0.192893) (end -3.1 0.9) (layer "F.Fab") (width 0.1) (tstamp e67a7ea6-357c-4748-83e6-88a8541ce6f7))
-  (fp_line (start -5.1 0.9) (end 5.1 0.9) (layer "F.Fab") (width 0.1) (tstamp ea4a0d0f-e11f-451f-8de7-cbc9a2e2e544))
-  (pad "1" smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d6e993b2-c851-45da-94ed-b355dceb1728))
-  (pad "2" smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dd8625ee-5ed8-4317-9867-54fec6f565f8))
-  (pad "3" smd roundrect (at -2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7dcf8a51-2c12-407a-a12e-ffb74363054b))
-  (pad "4" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 382d1103-0648-4f47-bdbb-905acf576ac5))
-  (pad "5" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c5eaf4ac-5dd4-4821-b818-62f75d23dbc4))
-  (pad "6" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cab3926e-93e4-471e-befa-16f598f4cac9))
-  (pad "7" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 496eb57a-f248-4e57-8c00-2ca95bdaeec2))
-  (pad "8" smd roundrect (at 2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fef71a01-672d-4d13-a20c-5f1af8bfdb0e))
-  (pad "9" smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7f22c4b5-59d1-4c70-9e0a-80c6c5cc82f5))
-  (pad "10" smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 86c72e10-a5ef-4282-9bdf-51c0cef89207))
-  (pad "MP" smd roundrect (at -4.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 251594d1-c277-48aa-862d-069a0868420b))
-  (pad "MP" smd roundrect (at 4.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp f91ebf3e-ae4c-49df-9334-5324ff643f6e))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM10B-SURS-TF_1x10-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical.kicad_mod
index c4080f406..c75c2f4f9 100644
--- a/Connector_JST.pretty/JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,52 +1,64 @@
-(footprint "JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM12B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2a87b75f-5505-456f-bc77-4dc594f5d513)
   )
-  (fp_text value "JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c26113d7-66d6-481f-a9b8-d5f4bc575513)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -5.9 0.9) (end 5.9 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.01 0.56) (end -6.01 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.01 1.01) (end -4.91 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.91 1.01) (end -4.91 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.01 0.56) (end 6.01 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.01 1.01) (end 4.91 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.84 -1.21) (end 4.84 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.9 -1.1) (end 5.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.9 0.9) (end -5.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.9 0.9) (end 5.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.8 -1.9) (end -6.8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.8 1.9) (end 6.8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.8 1.9) (end 6.8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.8 -1.9) (end -6.8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.9 0.9) (end -4.4 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 0.192893) (end -3.9 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.7 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 5.7 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6543563b-9d13-457a-8ccc-7a1a25afe2a8)
   )
-  (fp_line (start 6.01 1.01) (end 4.91 1.01) (layer "F.SilkS") (width 0.12) (tstamp 3e00ff3c-01ed-4a91-89a1-c10c5a69b103))
-  (fp_line (start -6.01 1.01) (end -4.91 1.01) (layer "F.SilkS") (width 0.12) (tstamp 4a1b0e33-29c6-4451-9666-3859ff2343b9))
-  (fp_line (start -4.91 1.01) (end -4.91 1.4) (layer "F.SilkS") (width 0.12) (tstamp 55a59809-3266-48e8-98e4-32065d18ed42))
-  (fp_line (start -4.84 -1.21) (end 4.84 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 5f1381f8-526c-48af-8619-85241b808306))
-  (fp_line (start 6.01 0.56) (end 6.01 1.01) (layer "F.SilkS") (width 0.12) (tstamp 85b6d1dc-48f3-4042-baa1-b3215b7a650f))
-  (fp_line (start -6.01 0.56) (end -6.01 1.01) (layer "F.SilkS") (width 0.12) (tstamp e294459c-354c-41e9-a0ad-5e45d8388fb8))
-  (fp_line (start -6.8 -1.9) (end -6.8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 038322d8-29e1-445a-b100-891fb4200a41))
-  (fp_line (start -6.8 1.9) (end 6.8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 4b7efcad-2b49-4ad4-b4d4-2f297eb97db1))
-  (fp_line (start 6.8 1.9) (end 6.8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 6579d84f-d988-41bd-905c-85c17985bd77))
-  (fp_line (start 6.8 -1.9) (end -6.8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 87685708-72a6-4465-baba-86ac2dbfdf2a))
-  (fp_line (start -4.9 0.9) (end -4.4 0.192893) (layer "F.Fab") (width 0.1) (tstamp 105be616-c410-4d3b-8532-f2f75e34a0ed))
-  (fp_line (start 5.9 0.9) (end 5.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 18281a67-5152-459a-95e2-283fb180622a))
-  (fp_line (start -4.4 0.192893) (end -3.9 0.9) (layer "F.Fab") (width 0.1) (tstamp 55d5253c-edac-4bc4-959d-b8414aa647b9))
-  (fp_line (start -5.9 -1.1) (end 5.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 67eeb604-28cd-4299-a204-56dd2d2c8a72))
-  (fp_line (start -5.9 0.9) (end -5.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp aeae6d13-95bf-4505-9aa2-c9ee18a556e1))
-  (fp_line (start -5.9 0.9) (end 5.9 0.9) (layer "F.Fab") (width 0.1) (tstamp e5bd7be7-5b63-4bf0-8586-0fa64a40e2aa))
-  (pad "1" smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8e173f9e-c553-4bec-b989-0762c35af906))
-  (pad "2" smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5d5ea810-292c-4b8c-942c-f0ef0226417a))
-  (pad "3" smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bb2ffe5e-9313-4627-a817-a8963017def0))
-  (pad "4" smd roundrect (at -2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7f348c78-5eac-4698-807f-d03ba05a33ee))
-  (pad "5" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp be6e58d7-e794-444e-950e-d8637349413d))
-  (pad "6" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 860d7231-db5c-4bbe-bd90-342be16fd7a2))
-  (pad "7" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dfb5b330-6d21-46fd-beee-b1192dd6aa16))
-  (pad "8" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cc679ba9-ee3c-49f6-92b3-6b1cbfac307f))
-  (pad "9" smd roundrect (at 2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 336bf36f-2dd0-4d6b-8ba3-25e4cc08d252))
-  (pad "10" smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6d583a68-0f89-4d21-93a1-4428cdb4ee61))
-  (pad "11" smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8db0f0af-79aa-49a7-bb51-f1d571e12f71))
-  (pad "12" smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5d69a9ae-56a1-42dd-be6e-abb1ae587ada))
-  (pad "MP" smd roundrect (at 5.7 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 82ba7629-f789-478f-87c5-dd892558865d))
-  (pad "MP" smd roundrect (at -5.7 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp be308c9c-fd2f-4262-96f5-7647e844ca7b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM12B-SURS-TF_1x12-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical.kicad_mod
index 6de9c531d..b030e2846 100644
--- a/Connector_JST.pretty/JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,54 +1,66 @@
-(footprint "JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM14B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4e51dd18-d628-4003-aa4e-b3c3162f2912)
   )
-  (fp_text value "JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1a90939f-ddda-42b2-963c-01691145cb04)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -6.7 0.9) (end 6.7 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.81 0.56) (end -6.81 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.81 1.01) (end -5.71 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.71 1.01) (end -5.71 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.81 0.56) (end 6.81 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.81 1.01) (end 5.71 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.64 -1.21) (end 5.64 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.7 -1.1) (end 6.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.7 0.9) (end -6.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.7 0.9) (end 6.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.6 -1.9) (end -7.6 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.6 1.9) (end 7.6 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.6 1.9) (end 7.6 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.6 -1.9) (end -7.6 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.7 0.9) (end -5.2 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.2 0.192893) (end -4.7 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 5.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.5 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.5 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4ba1c578-6582-44fd-a4e2-3b7fb9d5dda0)
   )
-  (fp_line (start -5.64 -1.21) (end 5.64 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 078c525b-2c7d-49cc-9827-244f99ae621e))
-  (fp_line (start -5.71 1.01) (end -5.71 1.4) (layer "F.SilkS") (width 0.12) (tstamp 4d7ef142-d756-4ac4-9d0f-ac1ccfa84e96))
-  (fp_line (start 6.81 1.01) (end 5.71 1.01) (layer "F.SilkS") (width 0.12) (tstamp 5723df77-f706-495c-a73b-3aaf874b8c2c))
-  (fp_line (start -6.81 1.01) (end -5.71 1.01) (layer "F.SilkS") (width 0.12) (tstamp a3911305-0860-4a7f-92c7-31423c0c5ea7))
-  (fp_line (start 6.81 0.56) (end 6.81 1.01) (layer "F.SilkS") (width 0.12) (tstamp ed3e59e2-175b-4924-ab28-691d465fcebc))
-  (fp_line (start -6.81 0.56) (end -6.81 1.01) (layer "F.SilkS") (width 0.12) (tstamp fe95155a-fcaf-4010-b041-210c30d7fa98))
-  (fp_line (start 7.6 -1.9) (end -7.6 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 0beac89c-0d7d-43cc-abf8-2aa8c50a1865))
-  (fp_line (start -7.6 -1.9) (end -7.6 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 89523971-b51c-45f9-ab69-65ffd7785389))
-  (fp_line (start -7.6 1.9) (end 7.6 1.9) (layer "F.CrtYd") (width 0.05) (tstamp f6948476-5081-495b-bce1-fedb5229a44f))
-  (fp_line (start 7.6 1.9) (end 7.6 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp fc979db9-ef7c-4b97-a7e9-c7365b6b2693))
-  (fp_line (start -5.2 0.192893) (end -4.7 0.9) (layer "F.Fab") (width 0.1) (tstamp 29854858-542f-4596-802a-b98acd1c4411))
-  (fp_line (start -5.7 0.9) (end -5.2 0.192893) (layer "F.Fab") (width 0.1) (tstamp 3600214e-bf2a-4c08-841b-9f613e43c91b))
-  (fp_line (start -6.7 0.9) (end 6.7 0.9) (layer "F.Fab") (width 0.1) (tstamp 73533ed3-c1f2-44af-81ab-5774502b9c70))
-  (fp_line (start 6.7 0.9) (end 6.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp d3bb16c5-3e10-4a05-a720-f0f93a279518))
-  (fp_line (start -6.7 0.9) (end -6.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp e8a593ee-78e9-47b4-8a25-18d9c87cfa98))
-  (fp_line (start -6.7 -1.1) (end 6.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp f01219bc-39a6-44d8-8c34-6713bb84ed73))
-  (pad "1" smd roundrect (at -5.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 01a4b6b8-d9ea-41c0-896e-83f42ef70b21))
-  (pad "2" smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e034bd44-6717-41e1-ace3-6293e5dd41d7))
-  (pad "3" smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 836da9e6-b735-477b-8922-df8eec5725ce))
-  (pad "4" smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1cc884a3-c67e-463b-ad61-2d95145133af))
-  (pad "5" smd roundrect (at -2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f547e6a-12b3-4053-9903-e3f9ae538139))
-  (pad "6" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 50dbd948-e14b-4312-bd95-bc4ebe7b9bc2))
-  (pad "7" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a48d94c9-5301-47bd-aad3-e4f3ef330503))
-  (pad "8" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3db159b9-6ee2-40ae-9ef6-9e3a39fbd63b))
-  (pad "9" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp efe2de80-4281-4240-a3a1-96fe134a2cc6))
-  (pad "10" smd roundrect (at 2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bbf42287-a8ff-4786-8ee3-685a6b6b65db))
-  (pad "11" smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6b46248c-ba3c-4d7c-b681-e813313b1e40))
-  (pad "12" smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 43a67f3f-bf1d-4203-803d-8b426c4be8b2))
-  (pad "13" smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3fd4b39d-c26b-4d75-abc6-b7721a929fed))
-  (pad "14" smd roundrect (at 5.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 24e523b0-17c9-464e-85be-4e5cd7753fef))
-  (pad "MP" smd roundrect (at 6.5 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 23ff5fec-4fe3-451e-86a9-b333d5a5725e))
-  (pad "MP" smd roundrect (at -6.5 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 4d117ded-66c1-4ba9-99f6-c8b51cc213dc))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM14B-SURS-TF_1x14-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical.kicad_mod
index c55acfc0c..da8de7734 100644
--- a/Connector_JST.pretty/JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,55 +1,67 @@
-(footprint "JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM15B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b047fdf0-1710-4f08-91b4-cf276d36f4c8)
   )
-  (fp_text value "JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 90a7b324-3d7a-426d-8447-63f8c8af75a9)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -7.1 0.9) (end 7.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.21 0.56) (end -7.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.21 1.01) (end -6.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 1.01) (end -6.11 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.21 0.56) (end 7.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.21 1.01) (end 6.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.04 -1.21) (end 6.04 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.1 -1.1) (end 7.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.1 0.9) (end -7.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.1 0.9) (end 7.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 -1.9) (end -8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8 1.9) (end 8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8 1.9) (end 8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8 -1.9) (end -8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.1 0.9) (end -5.6 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.6 0.192893) (end -5.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 1.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 2.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 3.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 4.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 5.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cc0ce223-8666-4290-8a07-b3d00a6c1fcf)
   )
-  (fp_line (start -7.21 1.01) (end -6.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp 04f68e46-7d50-4f2a-810c-d2ecca23d52f))
-  (fp_line (start 7.21 0.56) (end 7.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp 099bf963-f022-4512-be77-20be4603bb2f))
-  (fp_line (start 7.21 1.01) (end 6.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp 944aefc6-c7d3-42c7-8540-d5433d573c74))
-  (fp_line (start -6.11 1.01) (end -6.11 1.4) (layer "F.SilkS") (width 0.12) (tstamp c3a047d8-d6bd-44f1-bbb8-d939b0874df8))
-  (fp_line (start -6.04 -1.21) (end 6.04 -1.21) (layer "F.SilkS") (width 0.12) (tstamp daae1354-c224-4c7e-9674-fe6f571f68b3))
-  (fp_line (start -7.21 0.56) (end -7.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp fecf988f-4c0b-475e-af7f-c9d32a3f6fd7))
-  (fp_line (start -8 -1.9) (end -8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 21799043-71b8-483a-9166-d4034901db83))
-  (fp_line (start 8 1.9) (end 8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 325d9832-7822-4f53-9910-b2711cbc30d1))
-  (fp_line (start -8 1.9) (end 8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 397a738e-92a1-49c5-9885-b44971802a84))
-  (fp_line (start 8 -1.9) (end -8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp bb660a47-ac12-43ba-a030-3bda94c02ce1))
-  (fp_line (start 7.1 0.9) (end 7.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 063927b7-c53b-44fb-afea-14b2220ab5ea))
-  (fp_line (start -5.6 0.192893) (end -5.1 0.9) (layer "F.Fab") (width 0.1) (tstamp 09dc3eb8-b3e0-4db2-9f19-1c8de33acda8))
-  (fp_line (start -6.1 0.9) (end -5.6 0.192893) (layer "F.Fab") (width 0.1) (tstamp 3755986c-4649-49d2-b7b8-8850a5670a9d))
-  (fp_line (start -7.1 -1.1) (end 7.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 54cf3806-4d82-4aa0-acf8-81ecd8a22011))
-  (fp_line (start -7.1 0.9) (end -7.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp e0df4514-22d6-4793-a41e-212d82ec9843))
-  (fp_line (start -7.1 0.9) (end 7.1 0.9) (layer "F.Fab") (width 0.1) (tstamp fa771d1a-b786-45fc-aa11-f182b11bd319))
-  (pad "1" smd roundrect (at -5.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2b7ca867-83ce-4cb8-a4ac-94eb38ee2f79))
-  (pad "2" smd roundrect (at -4.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 531eb1ee-79dc-4aea-a552-e03824d5a2eb))
-  (pad "3" smd roundrect (at -4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6baffe17-2e6b-48e7-bec0-657f71c0756f))
-  (pad "4" smd roundrect (at -3.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 766aee44-4feb-407f-beb0-33beeb6c2bcd))
-  (pad "5" smd roundrect (at -2.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cb8e09b0-a57e-457b-b5e1-76b6ca763e07))
-  (pad "6" smd roundrect (at -1.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e57a821c-2969-4586-b9ee-e2309f95481a))
-  (pad "7" smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8a57737a-5048-43c0-917e-2d14a5e2bb75))
-  (pad "8" smd roundrect (at 0 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 56e58ecb-82bf-42c7-8b52-1a9b4b704873))
-  (pad "9" smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b5e8e02d-8aea-47c5-93c2-8a542d7f384f))
-  (pad "10" smd roundrect (at 1.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp db5b0ec9-9b0f-4e0c-807c-393e75f9d241))
-  (pad "11" smd roundrect (at 2.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 279edf10-7a26-4ca9-9c35-334be1f70710))
-  (pad "12" smd roundrect (at 3.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 879aefe0-b36b-4a53-b611-bcd0f45d8acd))
-  (pad "13" smd roundrect (at 4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2b5188c8-834a-4e47-bee7-2a902964650c))
-  (pad "14" smd roundrect (at 4.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp af437476-2483-44bf-b133-ab7d1632d3eb))
-  (pad "15" smd roundrect (at 5.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 946d9589-032f-4b54-a415-e86c134fe6ba))
-  (pad "MP" smd roundrect (at 6.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 3ff49bdc-3791-430c-a275-6910b9fd383d))
-  (pad "MP" smd roundrect (at -6.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 4147d62b-eda5-401f-8e23-d98f5dcf5b59))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM15B-SURS-TF_1x15-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical.kicad_mod
index fd9bf9833..bfa26e317 100644
--- a/Connector_JST.pretty/JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,56 +1,68 @@
-(footprint "JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM16B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f1d74084-6bed-4694-9846-edc2e6a8c097)
   )
-  (fp_text value "JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c3af1ce5-6e1c-43f6-a6b2-a455172faeea)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -7.5 0.9) (end 7.5 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.61 0.56) (end -7.61 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 1.01) (end -6.51 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.51 1.01) (end -6.51 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 0.56) (end 7.61 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 1.01) (end 6.51 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.44 -1.21) (end 6.44 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.5 -1.1) (end 7.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 0.9) (end -7.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.5 0.9) (end 7.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.4 -1.9) (end -8.4 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.4 1.9) (end 8.4 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 1.9) (end 8.4 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 -1.9) (end -8.4 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 0.9) (end -6 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 0.192893) (end -5.5 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 5.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.3 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.3 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp dd0a08b8-b516-4e58-91bb-4e3b639e7c96)
   )
-  (fp_line (start 7.61 0.56) (end 7.61 1.01) (layer "F.SilkS") (width 0.12) (tstamp 308be6dc-aff5-4cca-bfc3-38e01ced860b))
-  (fp_line (start 7.61 1.01) (end 6.51 1.01) (layer "F.SilkS") (width 0.12) (tstamp 3942db6b-9cf8-43a6-b773-d4afc58da470))
-  (fp_line (start -6.44 -1.21) (end 6.44 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 63eb03e1-b276-4ab8-bb27-023de90a427b))
-  (fp_line (start -6.51 1.01) (end -6.51 1.4) (layer "F.SilkS") (width 0.12) (tstamp 9c9694f0-967c-4450-9e09-527691690222))
-  (fp_line (start -7.61 1.01) (end -6.51 1.01) (layer "F.SilkS") (width 0.12) (tstamp dd86fee2-db9e-4c2d-80bf-1a90a3cc525a))
-  (fp_line (start -7.61 0.56) (end -7.61 1.01) (layer "F.SilkS") (width 0.12) (tstamp fa92a553-9e46-4434-8ece-c78eac5b073b))
-  (fp_line (start -8.4 1.9) (end 8.4 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 1c132dde-afc9-4cbb-ada6-5ad06c0accde))
-  (fp_line (start -8.4 -1.9) (end -8.4 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 53d4fb2b-2ab4-431c-8f67-d68c4b06f656))
-  (fp_line (start 8.4 1.9) (end 8.4 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 7c6c8c41-4ac9-4857-a5bb-06423115aa0b))
-  (fp_line (start 8.4 -1.9) (end -8.4 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp cb22bc5c-e40d-42b1-8b2b-5b14b89274a3))
-  (fp_line (start -7.5 0.9) (end -7.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp 09b03763-216c-4f2e-83ca-219f6329e236))
-  (fp_line (start 7.5 0.9) (end 7.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp 4e138205-ed7e-4394-977c-cbf6e8017e51))
-  (fp_line (start -6 0.192893) (end -5.5 0.9) (layer "F.Fab") (width 0.1) (tstamp 5ae12aba-d0c3-4ac5-837a-6c532af7fc03))
-  (fp_line (start -6.5 0.9) (end -6 0.192893) (layer "F.Fab") (width 0.1) (tstamp a88ac763-0267-4486-b96e-f718e073f16a))
-  (fp_line (start -7.5 -1.1) (end 7.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp ca1d6640-caf2-40ea-afee-36a7a3382b51))
-  (fp_line (start -7.5 0.9) (end 7.5 0.9) (layer "F.Fab") (width 0.1) (tstamp f4024f4a-9b54-4427-bf36-886a8153f578))
-  (pad "1" smd roundrect (at -6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 607cd150-0a45-452b-8f81-2776e6dd087a))
-  (pad "2" smd roundrect (at -5.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8bff8417-b789-4a2e-b67c-3fd46bab7723))
-  (pad "3" smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 35c0228f-7fa5-4d48-a085-97f731ae0c5f))
-  (pad "4" smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 04857510-cca6-4c32-bf6c-fa815ea6d1bf))
-  (pad "5" smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ff9a8258-1837-49f2-a3d0-86d847518140))
-  (pad "6" smd roundrect (at -2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fe4bd8ff-d3d0-4b70-a6a3-0d16789466ad))
-  (pad "7" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ee86eb4c-e4fb-47f2-91ab-816f4989a6b6))
-  (pad "8" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 494d02da-a222-4512-b00b-f730bf06e01a))
-  (pad "9" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e69f5c0-54e7-48a7-8e09-0e814abaf79b))
-  (pad "10" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb44f3a3-8b9a-4094-9b4d-e5393e5025a6))
-  (pad "11" smd roundrect (at 2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c403ec97-5bf0-4474-a45b-7c506342de3b))
-  (pad "12" smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 497f91e6-8e5c-4afa-96fd-3111789b8bd0))
-  (pad "13" smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 627e2232-0d67-4568-83a9-b903bfa4319a))
-  (pad "14" smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9da673f2-ae9e-4c10-b7ad-2252f267be5f))
-  (pad "15" smd roundrect (at 5.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 21f47716-0d79-492f-9a98-47b122fd2919))
-  (pad "16" smd roundrect (at 6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dff92eef-58fb-4e69-9a6d-3bd88153ca5f))
-  (pad "MP" smd roundrect (at 7.3 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 826f888a-cb5a-46fb-a14a-6e8397f6ed8c))
-  (pad "MP" smd roundrect (at -7.3 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp bbdbd2a8-af9a-40ea-a4f5-6b5a575c576b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM16B-SURS-TF_1x16-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical.kicad_mod
index 9a2ef1830..510530de7 100644
--- a/Connector_JST.pretty/JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,57 +1,69 @@
-(footprint "JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM17B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 15cc151f-06d6-471b-8b48-d599365fe84e)
   )
-  (fp_text value "JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp dddd4352-cbfc-469b-8dbd-d6cc62661589)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -7.9 0.9) (end 7.9 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.01 0.56) (end -8.01 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.01 1.01) (end -6.91 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.91 1.01) (end -6.91 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.01 0.56) (end 8.01 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.01 1.01) (end 6.91 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.84 -1.21) (end 6.84 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.9 -1.1) (end 7.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.9 0.9) (end -7.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.9 0.9) (end 7.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.8 -1.9) (end -8.8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.8 1.9) (end 8.8 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.8 1.9) (end 8.8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.8 -1.9) (end -8.8 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.9 0.9) (end -6.4 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.4 0.192893) (end -5.9 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 1.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 2.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 3.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 4.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 5.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 6.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.7 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.7 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7b39dc6e-5eee-4c7a-9b9b-1ed046c8d4dd)
   )
-  (fp_line (start -6.84 -1.21) (end 6.84 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 148f5620-9e58-48f4-a9ee-3339ea210b9e))
-  (fp_line (start 8.01 1.01) (end 6.91 1.01) (layer "F.SilkS") (width 0.12) (tstamp 3302553b-8886-4d60-9098-2cacab90d1b8))
-  (fp_line (start -8.01 1.01) (end -6.91 1.01) (layer "F.SilkS") (width 0.12) (tstamp 70c2f1ae-3955-4b4a-aa0a-6b3fbcba7ce2))
-  (fp_line (start -8.01 0.56) (end -8.01 1.01) (layer "F.SilkS") (width 0.12) (tstamp a26af829-6864-4dc6-af48-aed0438e6f17))
-  (fp_line (start -6.91 1.01) (end -6.91 1.4) (layer "F.SilkS") (width 0.12) (tstamp baf75424-23af-4fe0-9701-a1dd47941a80))
-  (fp_line (start 8.01 0.56) (end 8.01 1.01) (layer "F.SilkS") (width 0.12) (tstamp c8e1f857-ab7d-47d7-a67d-ea910570e039))
-  (fp_line (start 8.8 -1.9) (end -8.8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp db2661d6-7266-4fd9-b169-82f33df6241a))
-  (fp_line (start -8.8 -1.9) (end -8.8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp e185886e-eb54-404e-863a-a9ee6f3b66a0))
-  (fp_line (start -8.8 1.9) (end 8.8 1.9) (layer "F.CrtYd") (width 0.05) (tstamp f4bd49df-9342-409e-ba35-84512b825178))
-  (fp_line (start 8.8 1.9) (end 8.8 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp f4ff8c63-b0cc-4afa-95cc-d8e815adc999))
-  (fp_line (start -7.9 -1.1) (end 7.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 55579eac-3ba1-4f45-ad09-b02625d52610))
-  (fp_line (start 7.9 0.9) (end 7.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 662708eb-f40c-49ff-bc20-041bc47739d9))
-  (fp_line (start -7.9 0.9) (end -7.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 93153e77-bc19-47de-a38c-c06483c4d78a))
-  (fp_line (start -7.9 0.9) (end 7.9 0.9) (layer "F.Fab") (width 0.1) (tstamp ae8a21e0-6711-4bf3-8385-e7ad2f590e8e))
-  (fp_line (start -6.9 0.9) (end -6.4 0.192893) (layer "F.Fab") (width 0.1) (tstamp b022e67b-76d1-43d8-8361-edba0ec5d891))
-  (fp_line (start -6.4 0.192893) (end -5.9 0.9) (layer "F.Fab") (width 0.1) (tstamp ca7b9784-a060-4970-9651-8ea678897fd4))
-  (pad "1" smd roundrect (at -6.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2ffbdc95-00e8-4e02-91c7-a0d3a4fabdbe))
-  (pad "2" smd roundrect (at -5.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cb389c83-3f53-4f18-8f5f-34fda81eb193))
-  (pad "3" smd roundrect (at -4.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 053ba6c1-8447-4feb-8a5d-f2364d9f7403))
-  (pad "4" smd roundrect (at -4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d9245564-4c53-44d9-841a-4b32bc84293e))
-  (pad "5" smd roundrect (at -3.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e7de91e2-2501-4470-8292-411527d24808))
-  (pad "6" smd roundrect (at -2.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8502d01b-b5f5-4ed3-8335-e3c92a753753))
-  (pad "7" smd roundrect (at -1.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a1a9b249-d2e4-434a-b925-133993f81ae0))
-  (pad "8" smd roundrect (at -0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aa4bb814-e6e4-4825-830a-8d42dfe34177))
-  (pad "9" smd roundrect (at 0 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 88e193a5-d0c9-4319-8ade-c178077d87d6))
-  (pad "10" smd roundrect (at 0.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b299b8d1-70cd-451f-b39d-70191e175803))
-  (pad "11" smd roundrect (at 1.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1ce8a842-f651-4235-a167-3d9d0d63d053))
-  (pad "12" smd roundrect (at 2.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 292ba26a-b66f-4d7a-9dce-556f213b23f8))
-  (pad "13" smd roundrect (at 3.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ea299c25-4333-4d99-9575-1321601dc2b8))
-  (pad "14" smd roundrect (at 4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2c0aa099-6ee0-49ab-8376-593799a6f109))
-  (pad "15" smd roundrect (at 4.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d2d1faf1-d008-4b19-a0e3-fa91375a2c39))
-  (pad "16" smd roundrect (at 5.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 423acbe7-6a6d-4ed5-8bff-97d56f8b4f7b))
-  (pad "17" smd roundrect (at 6.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f4496013-ce52-4beb-8f83-ba5addc7eb49))
-  (pad "MP" smd roundrect (at 7.7 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 3fd506c3-fb1e-4bfe-a35a-e524780a6010))
-  (pad "MP" smd roundrect (at -7.7 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp a92d31ea-efbc-4bff-a5e9-66327f4e7e64))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM17B-SURS-TF_1x17-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical.kicad_mod
index 3cf9f1765..c5445f193 100644
--- a/Connector_JST.pretty/JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical.kicad_mod
@@ -1,60 +1,72 @@
-(footprint "JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, BM20B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR side entry")
+  (tags "connector JST SUR vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.6) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7df95dab-6e57-4234-b0fc-999da7c8c80a)
   )
-  (fp_text value "JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical" (at 0 2.6) (layer "F.Fab")
+  (fp_text value JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical (at 0 2.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 563a9fa0-6fe6-4b81-bf2f-419742942b9b)
   )
-  (fp_text user "${REFERENCE}" (at 0 -0.4) (layer "F.Fab")
+  (fp_line (start -9.1 0.9) (end 9.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.21 0.56) (end -9.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.21 1.01) (end -8.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.11 1.01) (end -8.11 1.4)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.21 0.56) (end 9.21 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.21 1.01) (end 8.11 1.01)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.04 -1.21) (end 8.04 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.1 -1.1) (end 9.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.1 0.9) (end -9.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.1 0.9) (end 9.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 -1.9) (end -10 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10 1.9) (end 10 1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 1.9) (end 10 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 -1.9) (end -10 -1.9)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.1 0.9) (end -7.6 0.192893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.6 0.192893) (end -7.1 0.9)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 5.2 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 6.8 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 7.6 0.85) (size 0.5 1.1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 8.9 -0.55) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 -0.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 20170425-20cc-40fe-8ac1-6fbb07c49f78)
   )
-  (fp_line (start -9.21 0.56) (end -9.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp 1741eada-c65e-4855-aa4d-72823fc584ea))
-  (fp_line (start -8.11 1.01) (end -8.11 1.4) (layer "F.SilkS") (width 0.12) (tstamp 35e5dde0-e492-4579-9ac0-2c9d48ff3c33))
-  (fp_line (start -9.21 1.01) (end -8.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp 5c98d347-ce73-41f5-b770-9a992371510e))
-  (fp_line (start -8.04 -1.21) (end 8.04 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 60cecd40-4a25-43f4-b398-159f2b61cd5a))
-  (fp_line (start 9.21 1.01) (end 8.11 1.01) (layer "F.SilkS") (width 0.12) (tstamp 820ef3aa-4f58-4c79-93d3-fd109336fc37))
-  (fp_line (start 9.21 0.56) (end 9.21 1.01) (layer "F.SilkS") (width 0.12) (tstamp f31e1cc9-efc1-4dff-968e-225518f65c0f))
-  (fp_line (start 10 1.9) (end 10 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp 4a4785a0-e4bb-4641-a9f7-6f5ba4ca489a))
-  (fp_line (start -10 1.9) (end 10 1.9) (layer "F.CrtYd") (width 0.05) (tstamp 50749077-a3a8-4cc1-be51-71c6fc3422a7))
-  (fp_line (start 10 -1.9) (end -10 -1.9) (layer "F.CrtYd") (width 0.05) (tstamp a025cd5a-efed-46db-b35b-f8a318adcfa6))
-  (fp_line (start -10 -1.9) (end -10 1.9) (layer "F.CrtYd") (width 0.05) (tstamp ef8f46ca-28e1-447c-a009-6d5a77542581))
-  (fp_line (start -7.6 0.192893) (end -7.1 0.9) (layer "F.Fab") (width 0.1) (tstamp 0deae6b3-49ea-4b68-b837-69546719e0db))
-  (fp_line (start 9.1 0.9) (end 9.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 313508d8-4704-45ab-b507-db1009c712fe))
-  (fp_line (start -9.1 0.9) (end 9.1 0.9) (layer "F.Fab") (width 0.1) (tstamp 3317dac6-9a90-4014-ae04-ef3035678f0d))
-  (fp_line (start -9.1 0.9) (end -9.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp b4f87026-8e29-41c2-840e-24dbd6391ed5))
-  (fp_line (start -9.1 -1.1) (end 9.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp cbd072fe-784d-4a08-bf0e-7b83d2e5fad1))
-  (fp_line (start -8.1 0.9) (end -7.6 0.192893) (layer "F.Fab") (width 0.1) (tstamp d667e9a2-de89-48c7-8e58-6fb9ab479405))
-  (pad "1" smd roundrect (at -7.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 44613ab4-39d8-4962-bdd9-9193c421c1ba))
-  (pad "2" smd roundrect (at -6.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 33f76784-25ea-4b47-bead-3e2d26737519))
-  (pad "3" smd roundrect (at -6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e3604739-ada5-43d2-9c8a-2c499b58c5e3))
-  (pad "4" smd roundrect (at -5.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cfe85a45-b05b-4e98-afc5-a996451ee9b1))
-  (pad "5" smd roundrect (at -4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 55627c11-f74c-4ec6-b5a8-e2b731c02dc3))
-  (pad "6" smd roundrect (at -3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fca74abb-f0b0-4504-87c3-7f9a1fed97b2))
-  (pad "7" smd roundrect (at -2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d710d540-3f17-4d66-b16d-e163f4606e6c))
-  (pad "8" smd roundrect (at -2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1df4aea7-cd23-44c0-ae75-f67d71631241))
-  (pad "9" smd roundrect (at -1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9c23e82f-dbd9-430c-9b17-c081c3e5e59f))
-  (pad "10" smd roundrect (at -0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b05577bc-1274-4d58-b47a-191ad808209e))
-  (pad "11" smd roundrect (at 0.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b8e9e540-ab7e-4d19-8043-7701709e58df))
-  (pad "12" smd roundrect (at 1.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b5ce7978-df56-49ff-b084-9776d51be442))
-  (pad "13" smd roundrect (at 2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 77627809-f4e0-4df0-8ae3-cb582d6c213d))
-  (pad "14" smd roundrect (at 2.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4843f0e3-297d-4331-b558-2bc8feef9b93))
-  (pad "15" smd roundrect (at 3.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eea829ee-da40-425f-a58b-c987186558bb))
-  (pad "16" smd roundrect (at 4.4 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 40b589dc-3ea1-4a8d-be10-eac22cf6d462))
-  (pad "17" smd roundrect (at 5.2 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d3040b72-82f8-444f-be77-52d568eebd8e))
-  (pad "18" smd roundrect (at 6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e6c42354-f2a4-4910-bb94-91279a95c380))
-  (pad "19" smd roundrect (at 6.8 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 71be4e10-1597-4a59-babd-abb42e98baa6))
-  (pad "20" smd roundrect (at 7.6 0.85) (size 0.5 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2d3f4497-0817-4ce0-8f0c-5fd54946d998))
-  (pad "MP" smd roundrect (at 8.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 663bfb30-f50f-4683-8139-0f7cbcb4beb1))
-  (pad "MP" smd roundrect (at -8.9 -0.55) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 757d368a-be9f-49f2-aeae-6c0e499d19aa))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_BM20B-SURS-TF_1x20-1MP_P0.80mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal.kicad_mod
index df772afe4..4bd5c2ee8 100644
--- a/Connector_JST.pretty/JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,53 +1,76 @@
-(footprint "JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM02B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp aa88e7ad-8523-4551-8fbc-02d843e07dc8)
   )
-  (fp_text value "JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp de955451-9031-428e-a602-285b8af886d7)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -1.9 -1.1) (end -1.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.05 -1.1) (end -1.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.05 -1.4) (end 1.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.05 -1.4) (end 1.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.05 -1.1) (end 1.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.01 -0.31) (end -2.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.01 -1.21) (end -1.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.16 -1.21) (end -1.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.16 -1.51) (end -0.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.91 -1.51) (end -0.91 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.01 -0.31) (end 2.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.01 -1.21) (end 1.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.16 -1.21) (end 1.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.16 -1.51) (end 0.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.84 1.41) (end 0.84 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.9 1.3) (end 1.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.9 -1.1) (end -1.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.9 -1.1) (end 1.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.8 -2.15) (end -2.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.8 2.15) (end 2.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.8 2.15) (end 2.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 2.8 -2.15) (end -2.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -0.9 -1.4) (end -0.4 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.4 -0.692893) (end 0.1 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.65 -2.503553) (end -0.4 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.4 -2.15) (end -0.15 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.15 -2.503553) (end -0.65 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 1.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 0.95 0.95) (thickness 0.14)))
-    (tstamp df43158e-8ae8-4de6-8756-1ff7f130d20c)
   )
-  (fp_line (start -2.01 -1.21) (end -1.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 00d2e140-da84-4ba4-8e21-0018eef696ed))
-  (fp_line (start 2.01 -0.31) (end 2.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 162ce11d-04c0-4b9f-a957-669e791af505))
-  (fp_line (start -0.65 -2.503553) (end -0.4 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 17a4a382-8b7a-4d37-9182-dd995dd2c2f0))
-  (fp_line (start -1.16 -1.51) (end -0.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 2f161ea4-bce3-46b0-9f35-350d0047b0f6))
-  (fp_line (start -0.4 -2.15) (end -0.15 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 314655b3-97f5-4a02-b632-f9177bb347a5))
-  (fp_line (start 1.16 -1.51) (end 0.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 41499782-a4d0-4f08-b1c4-301f715afbfd))
-  (fp_line (start -0.84 1.41) (end 0.84 1.41) (layer "F.SilkS") (width 0.12) (tstamp 4d2578b2-01eb-4166-b1d9-e0903d118049))
-  (fp_line (start 1.16 -1.21) (end 1.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 6aeaeb71-63b1-4e6a-ad0b-bb51fbde2652))
-  (fp_line (start -0.91 -1.51) (end -0.91 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 753c5676-28c1-405b-9ef0-d60a4b290988))
-  (fp_line (start -2.01 -0.31) (end -2.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 8ec4bfd2-3606-43e5-b09f-45eda020bb9d))
-  (fp_line (start 2.01 -1.21) (end 1.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 940d266f-65c1-4f70-a6b6-3af1ed3cff9d))
-  (fp_line (start -1.16 -1.21) (end -1.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp a4c3b2e7-4f0f-42f4-bc5b-c51292597fa8))
-  (fp_line (start -0.15 -2.503553) (end -0.65 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp a9262502-bddd-474f-b917-9c314f2a2613))
-  (fp_line (start -2.8 -2.15) (end -2.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 9057c7ae-4de3-45e5-a03c-1c69a1de6838))
-  (fp_line (start 2.8 -2.15) (end -2.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp b676b2dd-f1cc-4478-b373-286e32419eb3))
-  (fp_line (start -2.8 2.15) (end 2.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp d22a7bcf-8e9c-4783-a7d6-686f823f675d))
-  (fp_line (start 2.8 2.15) (end 2.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp e0a2ea19-ca1f-451d-b128-ebee84b5e0ee))
-  (fp_line (start -1.05 -1.4) (end 1.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp 100b5958-75a8-4fb4-bd8b-ceebe774db71))
-  (fp_line (start -1.9 -1.1) (end -1.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 1ce3e23f-120e-44a5-9bdc-71af551be3a4))
-  (fp_line (start 1.05 -1.4) (end 1.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp 26245fb1-f46c-4864-9320-785465372282))
-  (fp_line (start -1.9 1.3) (end 1.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 4024426e-1262-4294-840d-37ad83e33125))
-  (fp_line (start -1.9 -1.1) (end -1.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp 503604c9-bb11-4589-b7b3-08cfc0ea9cce))
-  (fp_line (start 1.9 -1.1) (end 1.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 92c3741d-9aaf-4111-8091-c7e03821919c))
-  (fp_line (start -1.05 -1.1) (end -1.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp 941a6104-9ccd-4598-87ea-2a0a0faea8a5))
-  (fp_line (start 1.05 -1.1) (end 1.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp ce764bbe-3e9a-4934-8459-d7b8b1fbb934))
-  (fp_line (start -0.9 -1.4) (end -0.4 -0.692893) (layer "F.Fab") (width 0.1) (tstamp d5c73f0c-31e5-4583-b42d-816c7607827b))
-  (fp_line (start -0.4 -0.692893) (end 0.1 -1.4) (layer "F.Fab") (width 0.1) (tstamp f6822492-7902-4c60-815c-bd0a2ff09d51))
-  (pad "1" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 415f4b87-667e-4482-a880-66bb9c75c7c5))
-  (pad "2" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 54ab7c53-1aea-43dc-9827-01d8c8ca7563))
-  (pad "MP" smd roundrect (at -1.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 177eadb3-e96c-4b22-adc2-a90e7ff3ced3))
-  (pad "MP" smd roundrect (at 1.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp edd828a5-2f0b-434b-b762-b9146183d4bb))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM02B-SURS-TF_1x02-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal.kicad_mod
index b421526d2..60fb80962 100644
--- a/Connector_JST.pretty/JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,54 +1,77 @@
-(footprint "JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM03B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 15e92505-5d66-434c-9945-82ac3c3a0e11)
   )
-  (fp_text value "JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 57d93eb4-333a-4a6a-a622-7bdefc30bb28)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -2.3 -1.1) (end -1.45 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.45 -1.1) (end -1.45 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.45 -1.4) (end 1.45 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.45 -1.4) (end 1.45 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.45 -1.1) (end 2.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.41 -0.31) (end -2.41 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.41 -1.21) (end -1.56 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.56 -1.21) (end -1.56 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.56 -1.51) (end -1.31 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.31 -1.51) (end -1.31 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.41 -0.31) (end 2.41 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.41 -1.21) (end 1.56 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.56 -1.21) (end 1.56 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.56 -1.51) (end 1.31 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.24 1.41) (end 1.24 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.3 1.3) (end 2.3 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.3 -1.1) (end -2.3 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.3 -1.1) (end 2.3 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.2 -2.15) (end -3.2 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.2 2.15) (end 3.2 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.2 2.15) (end 3.2 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.2 -2.15) (end -3.2 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.3 -1.4) (end -0.8 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.8 -0.692893) (end -0.3 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.05 -2.503553) (end -0.8 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.8 -2.15) (end -0.55 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.55 -2.503553) (end -1.05 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.1 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.1 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4585c03a-ce65-4df1-ad88-398f32f7e354)
   )
-  (fp_line (start 1.56 -1.51) (end 1.31 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 00095c0d-8d5c-4c24-abb9-8e800637b235))
-  (fp_line (start -0.55 -2.503553) (end -1.05 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 26754035-f644-433c-9c8e-11228d9a2d23))
-  (fp_line (start -0.8 -2.15) (end -0.55 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 4e02f533-6ed9-4267-906a-72eeb8e30ce8))
-  (fp_line (start 2.41 -0.31) (end 2.41 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 58dc32a5-1534-4899-b9e6-070901b3f849))
-  (fp_line (start -2.41 -1.21) (end -1.56 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 595913d1-dbb5-4767-9116-a29de86c46d9))
-  (fp_line (start -1.24 1.41) (end 1.24 1.41) (layer "F.SilkS") (width 0.12) (tstamp 5b4f0af1-8831-4134-b81b-598bff54f21b))
-  (fp_line (start 1.56 -1.21) (end 1.56 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 67f2926a-e620-412d-a429-bdf4bd99c8d5))
-  (fp_line (start -1.56 -1.51) (end -1.31 -1.51) (layer "F.SilkS") (width 0.12) (tstamp a0bc9338-2fd4-4aa5-9f3e-b46a6b7cb514))
-  (fp_line (start -1.56 -1.21) (end -1.56 -1.51) (layer "F.SilkS") (width 0.12) (tstamp c982f10c-7d79-4da6-93c4-30ab777f21ab))
-  (fp_line (start 2.41 -1.21) (end 1.56 -1.21) (layer "F.SilkS") (width 0.12) (tstamp cdb93b12-2116-4e2e-9586-5aa48493b09a))
-  (fp_line (start -1.05 -2.503553) (end -0.8 -2.15) (layer "F.SilkS") (width 0.12) (tstamp e1d4a160-2252-42b0-ab66-1008633963f8))
-  (fp_line (start -2.41 -0.31) (end -2.41 -1.21) (layer "F.SilkS") (width 0.12) (tstamp f410c52f-3b5b-4a2d-86bd-3bcc717758a2))
-  (fp_line (start -1.31 -1.51) (end -1.31 -1.65) (layer "F.SilkS") (width 0.12) (tstamp fd42e11f-9f91-4dd9-b8c5-117debc32354))
-  (fp_line (start 3.2 2.15) (end 3.2 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 20da7010-3487-4180-be3f-e8c032321731))
-  (fp_line (start 3.2 -2.15) (end -3.2 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 6be47a3b-a51a-4432-84a3-1fd39ba236f5))
-  (fp_line (start -3.2 2.15) (end 3.2 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 7a19900f-59d1-4a58-a4c3-3a3a9012db56))
-  (fp_line (start -3.2 -2.15) (end -3.2 2.15) (layer "F.CrtYd") (width 0.05) (tstamp f59a145a-b862-4c31-a2dd-60c61fc02774))
-  (fp_line (start 1.45 -1.4) (end 1.45 -1.1) (layer "F.Fab") (width 0.1) (tstamp 20bf5f10-548b-4be7-a627-f4ab128585ab))
-  (fp_line (start -1.3 -1.4) (end -0.8 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 32b1b9f2-c250-47dd-950e-a662c84e72ab))
-  (fp_line (start -2.3 1.3) (end 2.3 1.3) (layer "F.Fab") (width 0.1) (tstamp 3e1e39d6-8fa3-4e2a-859c-9654a3cb5a30))
-  (fp_line (start -1.45 -1.4) (end 1.45 -1.4) (layer "F.Fab") (width 0.1) (tstamp 584bc1e7-2807-4845-ac78-f482c8eaf58d))
-  (fp_line (start -1.45 -1.1) (end -1.45 -1.4) (layer "F.Fab") (width 0.1) (tstamp 6758ea53-7ed8-4f7a-8fc6-e505e4364b37))
-  (fp_line (start -2.3 -1.1) (end -1.45 -1.1) (layer "F.Fab") (width 0.1) (tstamp 747bdba7-fa9f-46aa-85e3-59603867851f))
-  (fp_line (start -0.8 -0.692893) (end -0.3 -1.4) (layer "F.Fab") (width 0.1) (tstamp 9ccabb69-9d9c-4a80-a98e-73afebab41cb))
-  (fp_line (start 1.45 -1.1) (end 2.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp c3704c07-cddc-40e5-81c8-578fa1a16961))
-  (fp_line (start -2.3 -1.1) (end -2.3 1.3) (layer "F.Fab") (width 0.1) (tstamp e309c8a9-d00a-4837-9948-daf2112e01a7))
-  (fp_line (start 2.3 -1.1) (end 2.3 1.3) (layer "F.Fab") (width 0.1) (tstamp ed8405b7-9bde-4b74-a2e6-dadc1fdb684f))
-  (pad "1" smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c3ceca4-5105-4e63-a636-70be1dc44392))
-  (pad "2" smd roundrect (at 0 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp deff29e2-6473-4bd7-9de4-27364156cfb5))
-  (pad "3" smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 53296367-2d82-4428-add8-8bf81563625c))
-  (pad "MP" smd roundrect (at -2.1 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 4f7536dc-4302-4ed0-b377-b4a7b4654325))
-  (pad "MP" smd roundrect (at 2.1 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 660e47b7-73e8-4654-88af-ebd6027ee19b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM03B-SURS-TF_1x03-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal.kicad_mod
index f11606556..d49a6a070 100644
--- a/Connector_JST.pretty/JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,55 +1,78 @@
-(footprint "JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM04B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5817a569-12a0-42fd-baf8-b518044a4948)
   )
-  (fp_text value "JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3783617c-7add-4f29-8831-2e988eee51b8)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -2.7 -1.1) (end -1.85 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.1) (end -1.85 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -1.4) (end 1.85 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.4) (end 1.85 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.85 -1.1) (end 2.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.81 -0.31) (end -2.81 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.81 -1.21) (end -1.96 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.96 -1.21) (end -1.96 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.96 -1.51) (end -1.71 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.71 -1.51) (end -1.71 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.81 -0.31) (end 2.81 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.81 -1.21) (end 1.96 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.96 -1.21) (end 1.96 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 1.96 -1.51) (end 1.71 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.64 1.41) (end 1.64 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.7 1.3) (end 2.7 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.7 -1.1) (end -2.7 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.7 -1.1) (end 2.7 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.6 -2.15) (end -3.6 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.6 2.15) (end 3.6 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.6 2.15) (end 3.6 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 3.6 -2.15) (end -3.6 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.7 -1.4) (end -1.2 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.2 -0.692893) (end -0.7 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.45 -2.503553) (end -1.2 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.2 -2.15) (end -0.95 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -0.95 -2.503553) (end -1.45 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.5 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.5 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 39e999cf-1199-4cdb-9679-47b1dad30768)
   )
-  (fp_line (start -2.81 -1.21) (end -1.96 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 2b29d7b2-9250-40e6-b960-fd506d24c209))
-  (fp_line (start -1.71 -1.51) (end -1.71 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 3bf7e234-f707-45ff-a3d7-c755ab8c0581))
-  (fp_line (start -1.96 -1.21) (end -1.96 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 3ef52338-f9dd-4c77-9565-4fecbb285aed))
-  (fp_line (start 1.96 -1.51) (end 1.71 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 6f56df8d-c226-44b0-8295-dc09a0e9aee4))
-  (fp_line (start 2.81 -1.21) (end 1.96 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 8fe32fcb-e259-4e8a-aedd-d5ae4f916abb))
-  (fp_line (start -2.81 -0.31) (end -2.81 -1.21) (layer "F.SilkS") (width 0.12) (tstamp a25caf8a-7335-4dbf-952e-fa153522add7))
-  (fp_line (start -0.95 -2.503553) (end -1.45 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp a40c89ea-50db-431f-9a54-43271c89880a))
-  (fp_line (start -1.2 -2.15) (end -0.95 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp ab9a2ab4-3642-4093-bef7-601915402ea9))
-  (fp_line (start -1.45 -2.503553) (end -1.2 -2.15) (layer "F.SilkS") (width 0.12) (tstamp bc9be53a-10a3-4f20-8164-379db677adb2))
-  (fp_line (start 1.96 -1.21) (end 1.96 -1.51) (layer "F.SilkS") (width 0.12) (tstamp c42a300c-6579-4c8e-b7ed-2e43d9fdb535))
-  (fp_line (start -1.96 -1.51) (end -1.71 -1.51) (layer "F.SilkS") (width 0.12) (tstamp c86a5655-6273-4f9c-99af-6cd6b018c585))
-  (fp_line (start 2.81 -0.31) (end 2.81 -1.21) (layer "F.SilkS") (width 0.12) (tstamp d96b3869-e05f-4a2d-a956-8076e62988f2))
-  (fp_line (start -1.64 1.41) (end 1.64 1.41) (layer "F.SilkS") (width 0.12) (tstamp e03eb3a8-1812-474c-879a-8517013c92d0))
-  (fp_line (start -3.6 2.15) (end 3.6 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 40d45772-6806-49ea-89ea-1fa7c8587a3a))
-  (fp_line (start -3.6 -2.15) (end -3.6 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 521f85fb-1e5b-402b-a7ce-3f4ab1f36586))
-  (fp_line (start 3.6 2.15) (end 3.6 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 7e9a787e-a94a-4f10-ab82-ce8caf3c29b2))
-  (fp_line (start 3.6 -2.15) (end -3.6 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp b0b86fa0-ceaa-4c42-a33b-a1fb273fde9a))
-  (fp_line (start 2.7 -1.1) (end 2.7 1.3) (layer "F.Fab") (width 0.1) (tstamp 3570f05e-5205-436a-a99e-d43dfe45b841))
-  (fp_line (start -2.7 -1.1) (end -1.85 -1.1) (layer "F.Fab") (width 0.1) (tstamp 39f21533-2cf2-4efb-8943-15f5915dbe29))
-  (fp_line (start -1.85 -1.1) (end -1.85 -1.4) (layer "F.Fab") (width 0.1) (tstamp 410a60c1-8280-4e4f-a447-8c3f1865b90e))
-  (fp_line (start -2.7 -1.1) (end -2.7 1.3) (layer "F.Fab") (width 0.1) (tstamp 50e3eec2-5bd7-422f-80b6-191059ebb1b3))
-  (fp_line (start 1.85 -1.4) (end 1.85 -1.1) (layer "F.Fab") (width 0.1) (tstamp 58e397ec-00d3-4a0c-bbee-81c88ddee384))
-  (fp_line (start -1.2 -0.692893) (end -0.7 -1.4) (layer "F.Fab") (width 0.1) (tstamp 59aadf33-a305-46e7-a23d-9d0d6f62c8d6))
-  (fp_line (start -2.7 1.3) (end 2.7 1.3) (layer "F.Fab") (width 0.1) (tstamp aeedeb26-5af1-4dfc-bc7e-468f592cdfe7))
-  (fp_line (start 1.85 -1.1) (end 2.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp c2695f26-66f7-4f39-b197-9fecdd7721d9))
-  (fp_line (start -1.85 -1.4) (end 1.85 -1.4) (layer "F.Fab") (width 0.1) (tstamp cbd57ff9-4c24-4ea2-a629-bec0445df897))
-  (fp_line (start -1.7 -1.4) (end -1.2 -0.692893) (layer "F.Fab") (width 0.1) (tstamp f6736758-9705-47da-be17-3cd56b81b1d0))
-  (pad "1" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 84b45803-5527-41e4-bd6b-77c74cf2a5c1))
-  (pad "2" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 63c27145-2b8a-4f4d-afea-53a3db7c0996))
-  (pad "3" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9d163538-0722-4f76-95f6-2b6baa8bc250))
-  (pad "4" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 48d21877-dcc4-4f65-842e-19e4fae28170))
-  (pad "MP" smd roundrect (at 2.5 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 09322438-152d-4ebd-bbee-dc1c68e93813))
-  (pad "MP" smd roundrect (at -2.5 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5a14140a-c371-428b-bde2-cbdd205e98f9))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM04B-SURS-TF_1x04-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal.kicad_mod
index 29117feed..74c21caa0 100644
--- a/Connector_JST.pretty/JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,56 +1,79 @@
-(footprint "JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM05B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 10997a6c-fdb6-4343-968c-ca5f1015b51e)
   )
-  (fp_text value "JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp be99bbdf-2576-4d6f-b303-32d97dbab7f8)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.1 -1.1) (end -2.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -1.1) (end -2.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -1.4) (end 2.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -1.4) (end 2.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.25 -1.1) (end 3.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.21 -0.31) (end -3.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.21 -1.21) (end -2.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.36 -1.21) (end -2.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.36 -1.51) (end -2.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.11 -1.51) (end -2.11 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.21 -0.31) (end 3.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.21 -1.21) (end 2.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.36 -1.21) (end 2.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.36 -1.51) (end 2.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.04 1.41) (end 2.04 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.1 1.3) (end 3.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.1 -1.1) (end -3.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.1 -1.1) (end 3.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -2.15) (end -4 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4 2.15) (end 4 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4 2.15) (end 4 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4 -2.15) (end -4 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.1 -1.4) (end -1.6 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.6 -0.692893) (end -1.1 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.85 -2.503553) (end -1.6 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.6 -2.15) (end -1.35 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.35 -2.503553) (end -1.85 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -1.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -2.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 2.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f8b61976-4a9c-457e-a20e-59a403cb7bf0)
   )
-  (fp_line (start -3.21 -0.31) (end -3.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 0b95fe6a-5763-44c1-874e-8360e73c0e1f))
-  (fp_line (start -1.6 -2.15) (end -1.35 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 0dd83688-94f1-48ca-8404-eab6c2d9a19b))
-  (fp_line (start -2.04 1.41) (end 2.04 1.41) (layer "F.SilkS") (width 0.12) (tstamp 4d65f999-b08f-404b-800a-e4b79cacaebd))
-  (fp_line (start 2.36 -1.51) (end 2.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 5018f97b-69c7-4ed4-b1b1-07918137da6c))
-  (fp_line (start 3.21 -0.31) (end 3.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 53d09479-1469-454f-8e5a-0a2892b15393))
-  (fp_line (start -1.35 -2.503553) (end -1.85 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 5578893d-c5a1-4508-af23-8f4f1f964524))
-  (fp_line (start 3.21 -1.21) (end 2.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 6cb88cd0-7365-4a47-9609-1160eb3f5d42))
-  (fp_line (start -2.11 -1.51) (end -2.11 -1.65) (layer "F.SilkS") (width 0.12) (tstamp bbdc6850-a119-42d9-ad03-917066654056))
-  (fp_line (start 2.36 -1.21) (end 2.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp c2374d1a-be81-4917-9e1c-fe8fa086edad))
-  (fp_line (start -2.36 -1.51) (end -2.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp cf0dafa2-4a9c-4010-a21d-425a4bef7362))
-  (fp_line (start -1.85 -2.503553) (end -1.6 -2.15) (layer "F.SilkS") (width 0.12) (tstamp d01465fe-dc46-4bd1-ab53-1e4619f33cfd))
-  (fp_line (start -3.21 -1.21) (end -2.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp ebdad1ac-ded1-47e0-9c4d-bdef3d354808))
-  (fp_line (start -2.36 -1.21) (end -2.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp ef62b391-315a-44ac-b2b1-b65e8e57ba1a))
-  (fp_line (start 4 -2.15) (end -4 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 77b3175f-1245-4e63-a713-953e9acb66a7))
-  (fp_line (start -4 2.15) (end 4 2.15) (layer "F.CrtYd") (width 0.05) (tstamp b228c4b0-8a14-45f2-9c57-0295a9127b0a))
-  (fp_line (start 4 2.15) (end 4 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp b62ef75f-e5d3-45e1-92a1-70de2768a2bc))
-  (fp_line (start -4 -2.15) (end -4 2.15) (layer "F.CrtYd") (width 0.05) (tstamp f1446ce1-5914-4066-9d9c-7d4db7713ae0))
-  (fp_line (start -3.1 -1.1) (end -3.1 1.3) (layer "F.Fab") (width 0.1) (tstamp 13f5df78-2a99-4d25-b38d-4f4a7a428d44))
-  (fp_line (start 3.1 -1.1) (end 3.1 1.3) (layer "F.Fab") (width 0.1) (tstamp 15097f2b-f10e-4989-a2cb-697ef2f6d750))
-  (fp_line (start -3.1 -1.1) (end -2.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp 18579d2a-d6eb-4de9-9149-a47922de992b))
-  (fp_line (start -2.25 -1.1) (end -2.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp 1d13a67d-41a9-4fe7-857f-582e6067e805))
-  (fp_line (start -2.1 -1.4) (end -1.6 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 1e53b41a-5fc6-4847-8c78-14b6a7f52fa9))
-  (fp_line (start 2.25 -1.1) (end 3.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 41cdc717-15b2-4ccc-9d17-136c1720f714))
-  (fp_line (start 2.25 -1.4) (end 2.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp 4d808e2a-da6b-4e27-9f71-92bdcd16992d))
-  (fp_line (start -1.6 -0.692893) (end -1.1 -1.4) (layer "F.Fab") (width 0.1) (tstamp 5f716741-b75f-49fc-8956-6cba78a2a62b))
-  (fp_line (start -3.1 1.3) (end 3.1 1.3) (layer "F.Fab") (width 0.1) (tstamp 65db8985-e4d9-4730-8dda-56632a47f270))
-  (fp_line (start -2.25 -1.4) (end 2.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp f37754de-4fac-450d-bd83-91d8c979bb55))
-  (pad "1" smd roundrect (at -1.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 35c2e71d-7151-4cc0-9205-d70b2d4b6d81))
-  (pad "2" smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fedafbbc-0a8c-4339-9c54-9b939259547c))
-  (pad "3" smd roundrect (at 0 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c2a0100f-96da-4b1d-b225-b3955f5ffcc7))
-  (pad "4" smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cf190e21-9e73-4d01-83b9-6553b02785c2))
-  (pad "5" smd roundrect (at 1.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 033ac758-da09-43a3-adfd-d1a717d1b3fa))
-  (pad "MP" smd roundrect (at -2.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 08a1104f-ec84-499f-b069-bba59362bfe2))
-  (pad "MP" smd roundrect (at 2.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 5e15510e-586c-421e-8690-c95d27e14695))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM05B-SURS-TF_1x05-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal.kicad_mod
index 1ed7d4dd3..89de9af2d 100644
--- a/Connector_JST.pretty/JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,57 +1,80 @@
-(footprint "JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM06B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b75f1ee7-7c11-466e-803a-9f9a875a4087)
   )
-  (fp_text value "JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9560de47-4851-42d9-a3d1-7a1919b8e888)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.5 -1.1) (end -2.65 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -1.1) (end -2.65 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.65 -1.4) (end 2.65 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -1.4) (end 2.65 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.65 -1.1) (end 3.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.61 -0.31) (end -3.61 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.61 -1.21) (end -2.76 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.76 -1.21) (end -2.76 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.76 -1.51) (end -2.51 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.51 -1.51) (end -2.51 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 -0.31) (end 3.61 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.61 -1.21) (end 2.76 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.76 -1.21) (end 2.76 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 2.76 -1.51) (end 2.51 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.44 1.41) (end 2.44 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.5 1.3) (end 3.5 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -1.1) (end -3.5 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -1.1) (end 3.5 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 -2.15) (end -4.4 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.4 2.15) (end 4.4 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 2.15) (end 4.4 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.4 -2.15) (end -4.4 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.5 -1.4) (end -2 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.692893) (end -1.5 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -2.503553) (end -2 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2 -2.15) (end -1.75 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.75 -2.503553) (end -2.25 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.3 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 3.3 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ca0489a1-64df-4f44-ac1d-e6922dd9743b)
   )
-  (fp_line (start -3.61 -0.31) (end -3.61 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 168b3f45-7daf-46ed-aab8-2905b1a2c7b1))
-  (fp_line (start -1.75 -2.503553) (end -2.25 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 3040ff76-6530-445a-867f-5add7a5458ba))
-  (fp_line (start -2.25 -2.503553) (end -2 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 35c614ff-d9a9-489b-85aa-483e1558b642))
-  (fp_line (start 3.61 -1.21) (end 2.76 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 3e00eecc-9359-488e-afcf-1118f7c614e6))
-  (fp_line (start -2.76 -1.51) (end -2.51 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 4b4da960-1b39-48ad-aacb-bac2bf5ac478))
-  (fp_line (start 2.76 -1.21) (end 2.76 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 4c42ff0f-4246-44b8-83fd-d97f6b2bbff2))
-  (fp_line (start -2.51 -1.51) (end -2.51 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 4e43a1bb-8a8c-4e98-babc-ffa616a39c4c))
-  (fp_line (start -2.44 1.41) (end 2.44 1.41) (layer "F.SilkS") (width 0.12) (tstamp 703e2311-1f28-4c8e-9fdd-a840ca23f5be))
-  (fp_line (start -2 -2.15) (end -1.75 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 7195c6c3-ba19-4b78-bac9-396b0780142d))
-  (fp_line (start 2.76 -1.51) (end 2.51 -1.51) (layer "F.SilkS") (width 0.12) (tstamp aa3b86bd-f72e-44b9-b8a4-363b674435a2))
-  (fp_line (start -3.61 -1.21) (end -2.76 -1.21) (layer "F.SilkS") (width 0.12) (tstamp b0b23e47-fc93-4a69-889f-412d811d9b1d))
-  (fp_line (start -2.76 -1.21) (end -2.76 -1.51) (layer "F.SilkS") (width 0.12) (tstamp c3f5822d-82b9-4266-88a5-88667d95a981))
-  (fp_line (start 3.61 -0.31) (end 3.61 -1.21) (layer "F.SilkS") (width 0.12) (tstamp ca720a48-1159-4517-ba83-819f9e816b14))
-  (fp_line (start -4.4 -2.15) (end -4.4 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 1a6475db-5609-4b49-bcec-7ffcd4d5a06a))
-  (fp_line (start -4.4 2.15) (end 4.4 2.15) (layer "F.CrtYd") (width 0.05) (tstamp ce01c83a-1faf-4b6e-8485-bae0088eb8e6))
-  (fp_line (start 4.4 -2.15) (end -4.4 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp d7238dc3-14e6-4106-921b-f6a15e935f08))
-  (fp_line (start 4.4 2.15) (end 4.4 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp fd09c98d-ed97-4e25-9392-31071e1df552))
-  (fp_line (start -2 -0.692893) (end -1.5 -1.4) (layer "F.Fab") (width 0.1) (tstamp 10d38a40-d625-4529-9e0b-9172edbc33ec))
-  (fp_line (start -2.65 -1.4) (end 2.65 -1.4) (layer "F.Fab") (width 0.1) (tstamp 1ecc5b31-0ffe-4d9e-bc55-2546497088d4))
-  (fp_line (start -3.5 1.3) (end 3.5 1.3) (layer "F.Fab") (width 0.1) (tstamp 244acebc-ee39-4eb8-a873-606432dc452b))
-  (fp_line (start -3.5 -1.1) (end -3.5 1.3) (layer "F.Fab") (width 0.1) (tstamp 4f15bb21-8c4b-4abb-8eac-8e21a00d281a))
-  (fp_line (start -3.5 -1.1) (end -2.65 -1.1) (layer "F.Fab") (width 0.1) (tstamp af4b0a55-1b53-41e8-9190-f5aa56fc5216))
-  (fp_line (start 2.65 -1.1) (end 3.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp b24f8895-dda6-44b1-aae3-7b8eb83dcd38))
-  (fp_line (start -2.65 -1.1) (end -2.65 -1.4) (layer "F.Fab") (width 0.1) (tstamp d3aed976-b236-4498-8d78-2517a49b250a))
-  (fp_line (start 2.65 -1.4) (end 2.65 -1.1) (layer "F.Fab") (width 0.1) (tstamp d555a0f7-eb07-4a44-9e11-6ed6234d3173))
-  (fp_line (start -2.5 -1.4) (end -2 -0.692893) (layer "F.Fab") (width 0.1) (tstamp ec607d5c-25e2-40d3-b90e-fb236884c18f))
-  (fp_line (start 3.5 -1.1) (end 3.5 1.3) (layer "F.Fab") (width 0.1) (tstamp f6ac869e-1140-4195-9fbf-c1380f21de01))
-  (pad "1" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 75031db1-33bd-4a8f-a2c9-b89260b5a521))
-  (pad "2" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6c7fc6cc-2a83-4f2e-9880-77c8401c82e8))
-  (pad "3" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9b6a6cd7-6057-4148-a6d3-520fd2b8561e))
-  (pad "4" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9b3a9dcd-2e46-4f7e-a2fd-2e172c193b34))
-  (pad "5" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3e7fa160-1539-4650-a352-e2acdab94024))
-  (pad "6" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ec31192c-2d10-4de6-b081-cd827208cb81))
-  (pad "MP" smd roundrect (at 3.3 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 10bfe485-a058-493d-9df6-721310307f8a))
-  (pad "MP" smd roundrect (at -3.3 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 738f5b2b-1cd8-4645-bea4-9357ab9e94fa))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM06B-SURS-TF_1x06-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal.kicad_mod
index 351cb5caf..4438d71d4 100644
--- a/Connector_JST.pretty/JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,59 +1,82 @@
-(footprint "JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM08B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 94969595-bb60-413c-85fa-78ed78d96286)
   )
-  (fp_text value "JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e6826936-a6d4-4817-95f7-f50c655ecc63)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4.3 -1.1) (end -3.45 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.45 -1.1) (end -3.45 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.45 -1.4) (end 3.45 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.45 -1.4) (end 3.45 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.45 -1.1) (end 4.3 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.41 -0.31) (end -4.41 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.41 -1.21) (end -3.56 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.56 -1.21) (end -3.56 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.56 -1.51) (end -3.31 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.31 -1.51) (end -3.31 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.41 -0.31) (end 4.41 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.41 -1.21) (end 3.56 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.56 -1.21) (end 3.56 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.56 -1.51) (end 3.31 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.24 1.41) (end 3.24 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.3 1.3) (end 4.3 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.3 -1.1) (end -4.3 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.3 -1.1) (end 4.3 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.2 -2.15) (end -5.2 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.2 2.15) (end 5.2 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.2 2.15) (end 5.2 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.2 -2.15) (end -5.2 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.3 -1.4) (end -2.8 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.8 -0.692893) (end -2.3 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.05 -2.503553) (end -2.8 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.8 -2.15) (end -2.55 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.55 -2.503553) (end -3.05 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.1 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.1 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 60b2cbde-a531-429a-808a-5ab02647848d)
   )
-  (fp_line (start 4.41 -1.21) (end 3.56 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 035ec30b-f4aa-4a97-b87c-2634056a44dc))
-  (fp_line (start -3.31 -1.51) (end -3.31 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 244aba2b-ffa1-4488-8eea-f6c21174df8f))
-  (fp_line (start -4.41 -1.21) (end -3.56 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 2e3b7338-cc9d-4625-8d33-1f6d4d137475))
-  (fp_line (start 3.56 -1.21) (end 3.56 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 2ef5fe11-c2dd-4409-a812-78ce4e7a6a55))
-  (fp_line (start -2.8 -2.15) (end -2.55 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 3f18d278-c2a5-4d80-b934-35fdff55a4fd))
-  (fp_line (start 3.56 -1.51) (end 3.31 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 4b10de60-715d-425c-b90f-203765eab8a1))
-  (fp_line (start -3.24 1.41) (end 3.24 1.41) (layer "F.SilkS") (width 0.12) (tstamp a8152159-a2e9-48bd-a72c-f8110c912246))
-  (fp_line (start 4.41 -0.31) (end 4.41 -1.21) (layer "F.SilkS") (width 0.12) (tstamp afa47858-094a-4262-bbf7-39e1b2ae6c97))
-  (fp_line (start -4.41 -0.31) (end -4.41 -1.21) (layer "F.SilkS") (width 0.12) (tstamp c86b0767-597e-4fc2-a357-8d505ebbbd28))
-  (fp_line (start -3.56 -1.21) (end -3.56 -1.51) (layer "F.SilkS") (width 0.12) (tstamp d82f07ff-fbac-42e5-93c6-9e42c7f2131d))
-  (fp_line (start -3.05 -2.503553) (end -2.8 -2.15) (layer "F.SilkS") (width 0.12) (tstamp f766a4f0-d6e7-41d5-83d2-bbdd64971690))
-  (fp_line (start -3.56 -1.51) (end -3.31 -1.51) (layer "F.SilkS") (width 0.12) (tstamp faae2d0c-3434-4bf4-9af8-088a97cdd1a5))
-  (fp_line (start -2.55 -2.503553) (end -3.05 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp fe7a0d5b-ee0c-48e7-a7ee-4f9c05cbf435))
-  (fp_line (start 5.2 -2.15) (end -5.2 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 6bf892f7-8261-46df-98ea-a82aab734689))
-  (fp_line (start 5.2 2.15) (end 5.2 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 6d47484b-bfe4-4a10-9cd2-6afea6efd5a8))
-  (fp_line (start -5.2 2.15) (end 5.2 2.15) (layer "F.CrtYd") (width 0.05) (tstamp b4c70157-ed4a-467a-a782-153211fa87ac))
-  (fp_line (start -5.2 -2.15) (end -5.2 2.15) (layer "F.CrtYd") (width 0.05) (tstamp ecc75757-44ff-4959-ac43-f98abb83eab8))
-  (fp_line (start -3.45 -1.1) (end -3.45 -1.4) (layer "F.Fab") (width 0.1) (tstamp 06de51df-22f5-43b8-b0ee-7d3d53962984))
-  (fp_line (start 3.45 -1.4) (end 3.45 -1.1) (layer "F.Fab") (width 0.1) (tstamp 211998bc-adc8-4c00-947a-1dc82d543c34))
-  (fp_line (start -3.45 -1.4) (end 3.45 -1.4) (layer "F.Fab") (width 0.1) (tstamp 37d39075-0325-438e-be8e-d02911976644))
-  (fp_line (start -3.3 -1.4) (end -2.8 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 41c6c548-e5f1-4627-a97a-ded1be2e1cac))
-  (fp_line (start -2.8 -0.692893) (end -2.3 -1.4) (layer "F.Fab") (width 0.1) (tstamp 4f268fb4-a2fc-4f4b-9392-7e1c5d689394))
-  (fp_line (start 3.45 -1.1) (end 4.3 -1.1) (layer "F.Fab") (width 0.1) (tstamp 6791a83f-f06e-46c0-afce-5a0ff21ea919))
-  (fp_line (start -4.3 -1.1) (end -3.45 -1.1) (layer "F.Fab") (width 0.1) (tstamp 9873b947-5d99-4bf5-9adf-b1f3c1fcb37e))
-  (fp_line (start 4.3 -1.1) (end 4.3 1.3) (layer "F.Fab") (width 0.1) (tstamp b619dcc3-2f0a-43e8-9aed-00cae9191676))
-  (fp_line (start -4.3 -1.1) (end -4.3 1.3) (layer "F.Fab") (width 0.1) (tstamp dadbf982-e686-4d87-ab96-d17468cdb580))
-  (fp_line (start -4.3 1.3) (end 4.3 1.3) (layer "F.Fab") (width 0.1) (tstamp fb9291c9-6a7d-4f5f-a7b0-6168c6af7630))
-  (pad "1" smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 174b484b-5c3d-4d2d-9a2e-7737890feccb))
-  (pad "2" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e46543a4-d7e0-481b-a507-76a0d8db2ec5))
-  (pad "3" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6c949486-d107-448f-ae32-101df3cb9d2d))
-  (pad "4" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp abd5b05e-dfcd-471f-a0ec-13232d59a865))
-  (pad "5" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1c3f07fc-4414-4526-b44b-53eb2324a2e5))
-  (pad "6" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 56d10243-2128-45c1-bbc2-85e84ec896af))
-  (pad "7" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 87917f69-10a7-4b76-a05f-1b3eccd70b59))
-  (pad "8" smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3a3c6ad9-e60d-4d94-8620-2c22a62fb4a8))
-  (pad "MP" smd roundrect (at 4.1 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 31af9893-74ac-4963-ae66-15afadd02eff))
-  (pad "MP" smd roundrect (at -4.1 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 7677d4e4-93ee-4d28-89cb-52660ad4653c))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM08B-SURS-TF_1x08-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal.kicad_mod
index e903e2265..1070696c7 100644
--- a/Connector_JST.pretty/JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,61 +1,84 @@
-(footprint "JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM10B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 96477d4e-870b-43e1-9304-2680e29a4b86)
   )
-  (fp_text value "JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6cfb9719-afe9-42e4-9161-de5114f954c9)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -5.1 -1.1) (end -4.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -1.1) (end -4.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -1.4) (end 4.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -1.4) (end 4.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -1.1) (end 5.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.21 -0.31) (end -5.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.21 -1.21) (end -4.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.36 -1.21) (end -4.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.36 -1.51) (end -4.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.11 -1.51) (end -4.11 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.21 -0.31) (end 5.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.21 -1.21) (end 4.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.36 -1.21) (end 4.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.36 -1.51) (end 4.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.04 1.41) (end 4.04 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.1 1.3) (end 5.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.1 -1.1) (end -5.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.1 -1.1) (end 5.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -2.15) (end -6 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6 2.15) (end 6 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6 2.15) (end 6 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6 -2.15) (end -6 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.1 -1.4) (end -3.6 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.6 -0.692893) (end -3.1 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.85 -2.503553) (end -3.6 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.6 -2.15) (end -3.35 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.35 -2.503553) (end -3.85 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 4.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c56ed83b-31a8-46a5-81fa-11aa85b7934f)
   )
-  (fp_line (start 4.36 -1.51) (end 4.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 0a4af3ff-3aa3-44dd-8ee2-1152943e2e4a))
-  (fp_line (start -3.85 -2.503553) (end -3.6 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 16d6e8ce-8b79-40ba-8c8b-a402f82fa039))
-  (fp_line (start 5.21 -0.31) (end 5.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 2980075e-a412-4dd2-9ab7-d88fe6988163))
-  (fp_line (start -4.04 1.41) (end 4.04 1.41) (layer "F.SilkS") (width 0.12) (tstamp 2cf467b7-f128-4058-941c-6c12510c7d9e))
-  (fp_line (start 4.36 -1.21) (end 4.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 3afda56e-dd19-4dfa-a78e-52b470054fff))
-  (fp_line (start -3.6 -2.15) (end -3.35 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 4f3a9e70-0447-4153-8009-78f42027886a))
-  (fp_line (start -5.21 -0.31) (end -5.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 6176e49c-432e-45c6-a27c-859b34f5eb23))
-  (fp_line (start -4.36 -1.51) (end -4.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 6b6ae3d7-401b-47b3-ab00-d10276d5c4ad))
-  (fp_line (start -5.21 -1.21) (end -4.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 8e418ac7-d3ff-4b1a-aa38-0fc58c5481e1))
-  (fp_line (start 5.21 -1.21) (end 4.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 99ffa522-fd3c-46d5-a6bd-bdfc4d4592ae))
-  (fp_line (start -3.35 -2.503553) (end -3.85 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 9c3ef09f-b07d-4b69-8913-cce012e5b2c2))
-  (fp_line (start -4.36 -1.21) (end -4.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp bdc1d8b4-964b-4919-abf2-a15537f48548))
-  (fp_line (start -4.11 -1.51) (end -4.11 -1.65) (layer "F.SilkS") (width 0.12) (tstamp cf914c46-635e-4570-8dde-718722148b50))
-  (fp_line (start -6 2.15) (end 6 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 85d773ee-1667-4af2-9dcc-f88bf13f79ae))
-  (fp_line (start 6 -2.15) (end -6 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 8862a1ea-3201-420d-83b6-b98ed6756e19))
-  (fp_line (start 6 2.15) (end 6 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp c0c5173e-2117-440a-a433-e5c03fffc745))
-  (fp_line (start -6 -2.15) (end -6 2.15) (layer "F.CrtYd") (width 0.05) (tstamp fdd72917-8506-43ea-a669-1a56c67c53a8))
-  (fp_line (start -3.6 -0.692893) (end -3.1 -1.4) (layer "F.Fab") (width 0.1) (tstamp 0c30669d-df05-419e-9a81-5714bea1a5e8))
-  (fp_line (start 5.1 -1.1) (end 5.1 1.3) (layer "F.Fab") (width 0.1) (tstamp 221d24fa-9977-446d-a3e1-afb41dd2a25d))
-  (fp_line (start -5.1 -1.1) (end -4.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp 366ab5bc-9b89-46fb-b3e6-bedd139b39ed))
-  (fp_line (start 4.25 -1.4) (end 4.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp 63eb54ae-05ff-407b-9e7a-f9a6a8c86f38))
-  (fp_line (start -4.25 -1.4) (end 4.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp 97174008-49cd-4cf3-bcb0-dce469470524))
-  (fp_line (start -4.1 -1.4) (end -3.6 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 9abd8b22-c523-48ac-9231-f92dfbb6acc5))
-  (fp_line (start 4.25 -1.1) (end 5.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp bb510a29-a927-4f4c-a3cd-dd290b62c7e3))
-  (fp_line (start -5.1 1.3) (end 5.1 1.3) (layer "F.Fab") (width 0.1) (tstamp d80d3f94-cc0f-4944-874c-10478eb67717))
-  (fp_line (start -4.25 -1.1) (end -4.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp da4ed74f-1b4f-42b5-9b6c-6e3a46455cc7))
-  (fp_line (start -5.1 -1.1) (end -5.1 1.3) (layer "F.Fab") (width 0.1) (tstamp e55bb4c0-37df-4593-80b3-c641be2e9071))
-  (pad "1" smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 02b855d7-dcb1-4739-a8ae-f79fc17c88e3))
-  (pad "2" smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0c7b461d-711a-4be3-89c1-69029f9db447))
-  (pad "3" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 050b78d8-9b0e-4ac0-9d36-fd562479ffbd))
-  (pad "4" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a0a287da-673d-4347-b54b-cd7ee682f049))
-  (pad "5" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3eb6c98b-34ba-4ceb-9b3e-904d47ac4da9))
-  (pad "6" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 39904bf7-2e60-4c65-a018-f15eca74f203))
-  (pad "7" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6b048323-ac53-4598-b520-92eaece69f5f))
-  (pad "8" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 75613786-e42b-490a-891c-31c92ddfd44c))
-  (pad "9" smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 37dc10f4-6c92-42e0-8a3b-49cf2060d02d))
-  (pad "10" smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6c4e6ba5-bbdb-4777-b295-c96b9d02fb48))
-  (pad "MP" smd roundrect (at -4.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 2aaeeda7-cc64-40fc-b726-10461b14b1cc))
-  (pad "MP" smd roundrect (at 4.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 349d235b-b168-4b77-a915-fd3248d63c82))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM10B-SURS-TF_1x10-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal.kicad_mod
index e81872415..a3ae67142 100644
--- a/Connector_JST.pretty/JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,63 +1,86 @@
-(footprint "JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM12B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1418b548-7f7e-4406-819a-2a2811b93a76)
   )
-  (fp_text value "JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5ce3c02c-d595-4797-ba1d-a905847c6408)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -5.9 -1.1) (end -5.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.05 -1.1) (end -5.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.05 -1.4) (end 5.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.05 -1.4) (end 5.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.05 -1.1) (end 5.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.01 -0.31) (end -6.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.01 -1.21) (end -5.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.16 -1.21) (end -5.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.16 -1.51) (end -4.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.91 -1.51) (end -4.91 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.01 -0.31) (end 6.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.01 -1.21) (end 5.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.16 -1.21) (end 5.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.16 -1.51) (end 4.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.84 1.41) (end 4.84 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.9 1.3) (end 5.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.9 -1.1) (end -5.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.9 -1.1) (end 5.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.8 -2.15) (end -6.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.8 2.15) (end 6.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.8 2.15) (end 6.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.8 -2.15) (end -6.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.9 -1.4) (end -4.4 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.4 -0.692893) (end -3.9 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.65 -2.503553) (end -4.4 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.4 -2.15) (end -4.15 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.15 -2.503553) (end -4.65 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 5.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d8e579b0-824e-4b34-82d9-3b7b8f5124ea)
   )
-  (fp_line (start -6.01 -0.31) (end -6.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 23dbde39-4115-4986-9b1a-c075a16db276))
-  (fp_line (start -4.91 -1.51) (end -4.91 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 27770af9-bf12-493e-a6d4-c55a6ea77da2))
-  (fp_line (start -4.15 -2.503553) (end -4.65 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 4e994533-c552-4eb3-a3e5-a46ae3bd67d8))
-  (fp_line (start -4.84 1.41) (end 4.84 1.41) (layer "F.SilkS") (width 0.12) (tstamp 554095af-b569-42bf-bc40-e5b1b998ff6b))
-  (fp_line (start -4.4 -2.15) (end -4.15 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 652a95e3-b68f-4d5f-9881-2d3b039dd889))
-  (fp_line (start 5.16 -1.51) (end 4.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 98fc4c17-4ba3-436e-809c-7e65c47fa924))
-  (fp_line (start 6.01 -1.21) (end 5.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp a57035ff-b850-4fe5-b058-1af50dd3c4db))
-  (fp_line (start -6.01 -1.21) (end -5.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp a5a25ac5-f0b4-44d6-98c3-2472cbe9cc98))
-  (fp_line (start -4.65 -2.503553) (end -4.4 -2.15) (layer "F.SilkS") (width 0.12) (tstamp bd1e3d60-f6c7-49f4-a086-324aa2f14dd0))
-  (fp_line (start -5.16 -1.51) (end -4.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp df712f27-deff-4dc2-8953-e44d48a2f3e2))
-  (fp_line (start 5.16 -1.21) (end 5.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp e3548341-2dd2-4e56-8ff4-f65e2cda210f))
-  (fp_line (start 6.01 -0.31) (end 6.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp ead52453-d700-4daf-854d-83f4a6fcbc1b))
-  (fp_line (start -5.16 -1.21) (end -5.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp eb7b7ae9-c7cc-4687-adff-e1e5a262ac19))
-  (fp_line (start 6.8 -2.15) (end -6.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 49bfd76f-63bc-4ae4-9e78-de5f10804d15))
-  (fp_line (start -6.8 -2.15) (end -6.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 637e39e7-bcc3-4991-8fd5-0e82f6c80668))
-  (fp_line (start -6.8 2.15) (end 6.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp bf1a5d18-1c5a-4a0e-90ae-5ae6be1354c5))
-  (fp_line (start 6.8 2.15) (end 6.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp e2827194-8983-4b62-95d8-b13c9c2b059f))
-  (fp_line (start -5.9 1.3) (end 5.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 16fb18dd-4540-4e39-8103-4f5d4ae1a46d))
-  (fp_line (start -4.9 -1.4) (end -4.4 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 1f7075e8-db9a-463b-a748-54638456c02b))
-  (fp_line (start -5.9 -1.1) (end -5.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 418d9683-01a0-40aa-b853-654e13d050bd))
-  (fp_line (start 5.05 -1.1) (end 5.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 531830e4-0954-4a97-b2bd-6278170e7b06))
-  (fp_line (start -5.05 -1.4) (end 5.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp 58ebc411-d8a3-4fc4-b547-c79454c41194))
-  (fp_line (start 5.9 -1.1) (end 5.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 5ac01e07-62c6-4b34-b644-5c76c51cbea5))
-  (fp_line (start -5.9 -1.1) (end -5.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp 5ddbd3bd-2475-4f53-9533-ba41ea030cd9))
-  (fp_line (start 5.05 -1.4) (end 5.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp 674cae6d-63ee-4e67-9164-2cfdb3aa6fe4))
-  (fp_line (start -4.4 -0.692893) (end -3.9 -1.4) (layer "F.Fab") (width 0.1) (tstamp 8bee83e6-b1fa-4aa2-85c3-1a6ddc15e564))
-  (fp_line (start -5.05 -1.1) (end -5.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp e0a042b6-6d2d-49ec-9747-7278e3f386a0))
-  (pad "1" smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c6496aef-fd81-4ce9-a120-71f0703468dd))
-  (pad "2" smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 38373c07-0bc7-4321-b367-68dbbe5e3b1d))
-  (pad "3" smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b8ccb4a6-5147-4961-9021-159b4b13de1a))
-  (pad "4" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a3273da9-8f69-40c0-b71d-08c3072743dd))
-  (pad "5" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2e84daea-f69f-4f50-81fb-5e3250dcd431))
-  (pad "6" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp becac5d4-b643-475d-a6c9-b61e52969f46))
-  (pad "7" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5d0c94d4-a7b4-4d3e-b8aa-cf9dab3315df))
-  (pad "8" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb159d0b-cb9c-463e-a570-aced8e6e7ce4))
-  (pad "9" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5e63eb2-3470-4908-8d3f-bc7484bc27f0))
-  (pad "10" smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a156bfff-f972-43b2-a2f4-5253959eb46d))
-  (pad "11" smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5359f2c6-5ab6-4fe7-b155-8ed8d3507431))
-  (pad "12" smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00f2ac8d-fa6b-4ece-8561-ab043c21b13b))
-  (pad "MP" smd roundrect (at 5.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 388bb228-a3a2-4588-a4fc-0b5db19f1711))
-  (pad "MP" smd roundrect (at -5.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp c7bb9d79-4ba8-440b-bad7-d042ea93d55b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM12B-SURS-TF_1x12-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal.kicad_mod
index 254c44454..8f199f17f 100644
--- a/Connector_JST.pretty/JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,65 +1,88 @@
-(footprint "JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM14B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 59d4bfcd-e125-46ef-99f4-99bb40a7e2cf)
   )
-  (fp_text value "JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7327756f-b535-41b1-a825-e0c8da663c04)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -6.7 -1.1) (end -5.85 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.85 -1.1) (end -5.85 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.85 -1.4) (end 5.85 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.85 -1.4) (end 5.85 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.85 -1.1) (end 6.7 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.81 -0.31) (end -6.81 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.81 -1.21) (end -5.96 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.96 -1.21) (end -5.96 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.96 -1.51) (end -5.71 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.71 -1.51) (end -5.71 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.81 -0.31) (end 6.81 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.81 -1.21) (end 5.96 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.96 -1.21) (end 5.96 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.96 -1.51) (end 5.71 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.64 1.41) (end 5.64 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.7 1.3) (end 6.7 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.7 -1.1) (end -6.7 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.7 -1.1) (end 6.7 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.6 -2.15) (end -7.6 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.6 2.15) (end 7.6 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.6 2.15) (end 7.6 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.6 -2.15) (end -7.6 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.7 -1.4) (end -5.2 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.2 -0.692893) (end -4.7 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.45 -2.503553) (end -5.2 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.2 -2.15) (end -4.95 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.95 -2.503553) (end -5.45 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.5 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.5 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5c257328-4ee1-4b9f-a3e1-510f37b62552)
   )
-  (fp_line (start 5.96 -1.21) (end 5.96 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 1a9c7679-3e3d-4328-b51b-ced32c862778))
-  (fp_line (start 5.96 -1.51) (end 5.71 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 2545ff24-38a0-4ffe-a6eb-cc857be28939))
-  (fp_line (start -5.45 -2.503553) (end -5.2 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 4a7a8611-edb7-47d6-a41b-47487990c616))
-  (fp_line (start -4.95 -2.503553) (end -5.45 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 60937c5c-fbcb-406d-8dba-fc5630692773))
-  (fp_line (start -5.64 1.41) (end 5.64 1.41) (layer "F.SilkS") (width 0.12) (tstamp 60b230dd-613c-4572-bce0-8e61730dbed0))
-  (fp_line (start 6.81 -1.21) (end 5.96 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 886ec50f-cc18-4a8a-820b-97e0d3c6179c))
-  (fp_line (start -5.71 -1.51) (end -5.71 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 8f67e9d7-47f4-4bd9-b344-bd38db505a00))
-  (fp_line (start -5.2 -2.15) (end -4.95 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp c3adff8e-e46e-4894-9617-0b22b49f1658))
-  (fp_line (start -6.81 -1.21) (end -5.96 -1.21) (layer "F.SilkS") (width 0.12) (tstamp d254097d-2bf1-4fc5-8023-7c501d7f5dbf))
-  (fp_line (start -5.96 -1.21) (end -5.96 -1.51) (layer "F.SilkS") (width 0.12) (tstamp e2bf770b-b9ae-456e-ba58-de9006730cda))
-  (fp_line (start -5.96 -1.51) (end -5.71 -1.51) (layer "F.SilkS") (width 0.12) (tstamp e8592cb0-6972-47a4-9cc1-12b27505af18))
-  (fp_line (start -6.81 -0.31) (end -6.81 -1.21) (layer "F.SilkS") (width 0.12) (tstamp ef824947-6b65-43c1-bd90-f737468ae337))
-  (fp_line (start 6.81 -0.31) (end 6.81 -1.21) (layer "F.SilkS") (width 0.12) (tstamp ff4aae57-7937-4768-b264-f1f62b489049))
-  (fp_line (start 7.6 2.15) (end 7.6 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 2978ceb5-86de-451a-a76d-f5894c4cace2))
-  (fp_line (start 7.6 -2.15) (end -7.6 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 2ffcc3dd-9096-44c1-b886-6fd17dec49e4))
-  (fp_line (start -7.6 2.15) (end 7.6 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 5b1120fd-df05-4638-8668-238a7f550b06))
-  (fp_line (start -7.6 -2.15) (end -7.6 2.15) (layer "F.CrtYd") (width 0.05) (tstamp c0b435cb-de18-4132-8cc3-67f6efc8ea91))
-  (fp_line (start 6.7 -1.1) (end 6.7 1.3) (layer "F.Fab") (width 0.1) (tstamp 2b4439c9-5acd-4aff-a08c-4bcc06a6a03d))
-  (fp_line (start -6.7 1.3) (end 6.7 1.3) (layer "F.Fab") (width 0.1) (tstamp 9e1bad1e-3a0b-445a-9015-e1469e026785))
-  (fp_line (start -5.2 -0.692893) (end -4.7 -1.4) (layer "F.Fab") (width 0.1) (tstamp 9fd9ed08-c4e7-4c22-9285-da0ab7eb7748))
-  (fp_line (start 5.85 -1.4) (end 5.85 -1.1) (layer "F.Fab") (width 0.1) (tstamp a6ede3c6-61aa-4d2a-beb0-67ffc7f6566f))
-  (fp_line (start -5.7 -1.4) (end -5.2 -0.692893) (layer "F.Fab") (width 0.1) (tstamp b5f95f11-b07e-4fe2-ac57-5f3a0dffaeb0))
-  (fp_line (start -5.85 -1.4) (end 5.85 -1.4) (layer "F.Fab") (width 0.1) (tstamp bf52c4c1-583a-40aa-a134-8e67d3a7eb5d))
-  (fp_line (start 5.85 -1.1) (end 6.7 -1.1) (layer "F.Fab") (width 0.1) (tstamp c17b2a33-65a0-4f99-9294-8ea9fa35bf53))
-  (fp_line (start -6.7 -1.1) (end -5.85 -1.1) (layer "F.Fab") (width 0.1) (tstamp c93eba8e-be0a-42b2-b87e-a639cba4adfa))
-  (fp_line (start -5.85 -1.1) (end -5.85 -1.4) (layer "F.Fab") (width 0.1) (tstamp cc3b031b-98cc-4670-9901-0394cf8b4a0f))
-  (fp_line (start -6.7 -1.1) (end -6.7 1.3) (layer "F.Fab") (width 0.1) (tstamp ef4a3d9a-8680-4ff6-8786-3a760974e582))
-  (pad "1" smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 50a498d7-5321-4b9e-a6db-a175efab6706))
-  (pad "2" smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d3dfee03-1d52-41f9-9fbf-876478ddb513))
-  (pad "3" smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 840e00d3-7bec-4bfd-ae1b-81d55852ce4f))
-  (pad "4" smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 10a2882a-be7c-4e9b-ac27-51f74ac8681b))
-  (pad "5" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp add5d133-c855-4e43-969b-f1620b434dfd))
-  (pad "6" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 44a874d8-a002-4253-b87f-0a369c3e4aff))
-  (pad "7" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 202c9427-6f23-43ef-bb5c-615fac1e3178))
-  (pad "8" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 156da8e2-418e-43a5-9ea8-6b02a90d424c))
-  (pad "9" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bfd2aa93-ba47-4798-9e7a-c360bf60ec4b))
-  (pad "10" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6f01f3d5-2c90-459d-b43d-bc4e41fd6249))
-  (pad "11" smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp beda058f-92e7-4792-bcaa-d7861e0bc555))
-  (pad "12" smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c2c1ba7b-1e5d-4a07-983f-3bfdc749f866))
-  (pad "13" smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1d644f83-2911-4832-b528-1de98a61c4bf))
-  (pad "14" smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 853632fc-f5d7-4ddb-90e3-e95725f2e0cf))
-  (pad "MP" smd roundrect (at -6.5 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 3918c43d-dfaa-45a0-9638-1c56b2bb9125))
-  (pad "MP" smd roundrect (at 6.5 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp fe9fc8d2-6310-4519-99d7-c4802830eb60))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM14B-SURS-TF_1x14-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal.kicad_mod
index 2a0fc9541..413adfa33 100644
--- a/Connector_JST.pretty/JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,66 +1,89 @@
-(footprint "JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM15B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5e27b8b6-c24d-4a8d-9189-e69f4c53a8bc)
   )
-  (fp_text value "JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 38216099-52ef-4373-a0f7-403648f87439)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7.1 -1.1) (end -6.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -1.1) (end -6.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -1.4) (end 6.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -1.4) (end 6.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -1.1) (end 7.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.21 -0.31) (end -7.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.21 -1.21) (end -6.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.36 -1.21) (end -6.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.36 -1.51) (end -6.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 -1.51) (end -6.11 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.21 -0.31) (end 7.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.21 -1.21) (end 6.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.36 -1.21) (end 6.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.36 -1.51) (end 6.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.04 1.41) (end 6.04 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.1 1.3) (end 7.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.1 -1.1) (end -7.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.1 -1.1) (end 7.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 -2.15) (end -8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8 2.15) (end 8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8 2.15) (end 8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8 -2.15) (end -8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.1 -1.4) (end -5.6 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.6 -0.692893) (end -5.1 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.85 -2.503553) (end -5.6 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.6 -2.15) (end -5.35 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.35 -2.503553) (end -5.85 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -5.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 1.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 2.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 3.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 4.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 5.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 6.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 80559729-9e41-4793-8c25-8565be310923)
   )
-  (fp_line (start -5.85 -2.503553) (end -5.6 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 101ff161-a86c-4dcd-9ba8-4eb6061b1afd))
-  (fp_line (start -7.21 -0.31) (end -7.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 1d947bee-40be-46f7-99ff-dc1affa508bf))
-  (fp_line (start -5.6 -2.15) (end -5.35 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 2f5c05d3-997d-440c-a2e2-11a5b65bfe57))
-  (fp_line (start 6.36 -1.51) (end 6.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 4034aa56-bdae-4e74-80e8-28b9d64bc134))
-  (fp_line (start -6.11 -1.51) (end -6.11 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 4bd29116-c874-42ae-b887-6314bae9b79c))
-  (fp_line (start -7.21 -1.21) (end -6.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 4e77d409-b487-43d9-bff2-c78ca8af1994))
-  (fp_line (start -6.04 1.41) (end 6.04 1.41) (layer "F.SilkS") (width 0.12) (tstamp 603d186a-0c3f-47c1-9e4e-b7fdcc1e3558))
-  (fp_line (start 7.21 -0.31) (end 7.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 9f354f0e-e79f-4500-83b0-a4224767067e))
-  (fp_line (start 7.21 -1.21) (end 6.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp a4e93d74-bbb5-41e1-bf09-220dcf61769a))
-  (fp_line (start -6.36 -1.51) (end -6.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp aad825a1-9316-413d-93a0-9f33af32c9f7))
-  (fp_line (start -5.35 -2.503553) (end -5.85 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp cb218f5a-8b76-4032-b04a-26882cbe9975))
-  (fp_line (start -6.36 -1.21) (end -6.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp e4d4b41e-8251-4172-b11c-7cb4db922c22))
-  (fp_line (start 6.36 -1.21) (end 6.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp e80c1ba1-59e4-4bb2-a4f4-a3a18211a417))
-  (fp_line (start -8 -2.15) (end -8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 25b1d1d6-50e3-4bce-a11e-1ca613433001))
-  (fp_line (start -8 2.15) (end 8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 3b24f421-c631-4075-89b7-2fe5d3b791cc))
-  (fp_line (start 8 -2.15) (end -8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 97d481f7-671a-44de-92b3-93b37d5d9abd))
-  (fp_line (start 8 2.15) (end 8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp ffa4616e-5da1-4bcc-a44d-5ea785db31b9))
-  (fp_line (start -7.1 -1.1) (end -7.1 1.3) (layer "F.Fab") (width 0.1) (tstamp 2460c324-d8d1-48e9-b194-42072966a805))
-  (fp_line (start -7.1 1.3) (end 7.1 1.3) (layer "F.Fab") (width 0.1) (tstamp 526fa914-f62e-4af9-8beb-2a481a7fc39a))
-  (fp_line (start -7.1 -1.1) (end -6.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp 63bf1851-25e9-4f9b-9b03-c0ca34c4e710))
-  (fp_line (start 6.25 -1.1) (end 7.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp 7eb3e2df-e375-4bb9-90f3-18866a48cdf6))
-  (fp_line (start -6.1 -1.4) (end -5.6 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 852e6849-aa5d-4b10-b34b-e06650c0d559))
-  (fp_line (start 6.25 -1.4) (end 6.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp c8a90339-baa9-4406-87c7-ff15b8c312a8))
-  (fp_line (start 7.1 -1.1) (end 7.1 1.3) (layer "F.Fab") (width 0.1) (tstamp cd1ec98a-c4cb-4c71-9280-0bf73fc0d834))
-  (fp_line (start -6.25 -1.4) (end 6.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp d5af18c6-1287-4667-a487-c05698bd730c))
-  (fp_line (start -6.25 -1.1) (end -6.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp d834a80b-21fb-4471-935c-60f5e2210fe3))
-  (fp_line (start -5.6 -0.692893) (end -5.1 -1.4) (layer "F.Fab") (width 0.1) (tstamp e995aec9-9f47-4a86-9d49-dcb52d8ea78f))
-  (pad "1" smd roundrect (at -5.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e178bc36-fc95-416b-8043-9c4a91c450ea))
-  (pad "2" smd roundrect (at -4.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4c9be584-1aca-4c63-b491-9d35c8177fcb))
-  (pad "3" smd roundrect (at -4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 388db5c4-e0d1-4fdd-be1a-80dfdad46523))
-  (pad "4" smd roundrect (at -3.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5c01c93-5358-4cc3-b419-615744f71724))
-  (pad "5" smd roundrect (at -2.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ea3002f2-d424-4a6c-b688-d9c801debd4c))
-  (pad "6" smd roundrect (at -1.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp daaadb86-4120-4769-9186-97fbc4270551))
-  (pad "7" smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3504a3cb-ecb2-4db8-9d9f-2e720d915faf))
-  (pad "8" smd roundrect (at 0 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 89c37b87-acfe-4a5d-9e91-f3b124c8a6c2))
-  (pad "9" smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 747939f7-6bfc-4dc6-a583-b4b64623c553))
-  (pad "10" smd roundrect (at 1.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 80f555ba-efb4-405e-9e2a-45059366e741))
-  (pad "11" smd roundrect (at 2.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7e35b9e7-db09-4465-b4f7-deb01e92f7a2))
-  (pad "12" smd roundrect (at 3.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b29c60a1-9c3f-4e40-a169-e5ff74708f1d))
-  (pad "13" smd roundrect (at 4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6b2d71d7-7e2a-4eaa-9519-4a470363f607))
-  (pad "14" smd roundrect (at 4.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9a536b50-6e8b-4d80-adb7-85f052f00c8c))
-  (pad "15" smd roundrect (at 5.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 73ca66d5-5596-4f08-b95a-3265a2f8a1da))
-  (pad "MP" smd roundrect (at -6.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 52c13e2c-2134-43a6-838a-17ce2884d518))
-  (pad "MP" smd roundrect (at 6.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp f0a01198-b171-41c5-8c5b-5255ee7e48ba))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM15B-SURS-TF_1x15-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal.kicad_mod
index 922934311..d161d6c5b 100644
--- a/Connector_JST.pretty/JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,67 +1,90 @@
-(footprint "JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM16B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7937cd85-dea7-482d-a5bf-5d8e6d125d4a)
   )
-  (fp_text value "JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 094c69dd-efd2-4c5f-a60c-11bab24336db)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7.5 -1.1) (end -6.65 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.65 -1.1) (end -6.65 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.65 -1.4) (end 6.65 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.65 -1.4) (end 6.65 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.65 -1.1) (end 7.5 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.61 -0.31) (end -7.61 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 -1.21) (end -6.76 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.76 -1.21) (end -6.76 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.76 -1.51) (end -6.51 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.51 -1.51) (end -6.51 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 -0.31) (end 7.61 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 -1.21) (end 6.76 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.76 -1.21) (end 6.76 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.76 -1.51) (end 6.51 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.44 1.41) (end 6.44 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.5 1.3) (end 7.5 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 -1.1) (end -7.5 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.5 -1.1) (end 7.5 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.4 -2.15) (end -8.4 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.4 2.15) (end 8.4 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 2.15) (end 8.4 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.4 -2.15) (end -8.4 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 -1.4) (end -6 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -0.692893) (end -5.5 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -2.503553) (end -6 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6 -2.15) (end -5.75 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.75 -2.503553) (end -6.25 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.3 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.3 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c8e98053-c213-4bf4-a6f0-963bfe93a512)
   )
-  (fp_line (start -6 -2.15) (end -5.75 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 1cadad4c-fa32-4b1d-b274-7675c4002380))
-  (fp_line (start 7.61 -1.21) (end 6.76 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 3de80a1c-03a0-41a9-b404-3174821d9e59))
-  (fp_line (start -6.76 -1.21) (end -6.76 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 42e5d063-2980-4cb6-81aa-dd6c6c7addf4))
-  (fp_line (start -6.25 -2.503553) (end -6 -2.15) (layer "F.SilkS") (width 0.12) (tstamp acc62b58-68f6-4e0b-93b8-ee6020a08946))
-  (fp_line (start -6.44 1.41) (end 6.44 1.41) (layer "F.SilkS") (width 0.12) (tstamp b937561a-752b-4635-83cc-f639a3c11893))
-  (fp_line (start -5.75 -2.503553) (end -6.25 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp bff69237-cd13-4f88-8409-9928bede97d6))
-  (fp_line (start 6.76 -1.51) (end 6.51 -1.51) (layer "F.SilkS") (width 0.12) (tstamp d02d89bc-b822-4b96-a9c8-a3365056ff3d))
-  (fp_line (start 7.61 -0.31) (end 7.61 -1.21) (layer "F.SilkS") (width 0.12) (tstamp e877e06e-dd6d-403f-9d79-d8d251fb86b0))
-  (fp_line (start 6.76 -1.21) (end 6.76 -1.51) (layer "F.SilkS") (width 0.12) (tstamp eaf43444-0674-4b7a-8afa-9665b0407d3d))
-  (fp_line (start -6.76 -1.51) (end -6.51 -1.51) (layer "F.SilkS") (width 0.12) (tstamp ec06b87f-6f1a-43b3-bb89-5b4e1be233f2))
-  (fp_line (start -6.51 -1.51) (end -6.51 -1.65) (layer "F.SilkS") (width 0.12) (tstamp f8f1bbf1-978d-4eb8-b281-81b23f560f37))
-  (fp_line (start -7.61 -0.31) (end -7.61 -1.21) (layer "F.SilkS") (width 0.12) (tstamp fc7ce539-1bf8-4cda-b928-b3a8f2267760))
-  (fp_line (start -7.61 -1.21) (end -6.76 -1.21) (layer "F.SilkS") (width 0.12) (tstamp ff1b69d0-ff82-40e3-b1a1-c41add5329a2))
-  (fp_line (start 8.4 -2.15) (end -8.4 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 48b88534-130a-4e1e-924c-b4134c46b756))
-  (fp_line (start -8.4 2.15) (end 8.4 2.15) (layer "F.CrtYd") (width 0.05) (tstamp a3d0967c-e63c-4e37-a56c-afd88f927888))
-  (fp_line (start 8.4 2.15) (end 8.4 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp d7493878-a254-4c82-91d4-e2d42e36942f))
-  (fp_line (start -8.4 -2.15) (end -8.4 2.15) (layer "F.CrtYd") (width 0.05) (tstamp f162a227-51fd-4114-86b9-0cb3ec77c2e1))
-  (fp_line (start -7.5 -1.1) (end -6.65 -1.1) (layer "F.Fab") (width 0.1) (tstamp 303d2ab0-9cdf-40d5-9b1b-eaee1fc5d15f))
-  (fp_line (start -7.5 1.3) (end 7.5 1.3) (layer "F.Fab") (width 0.1) (tstamp 31bfd604-dc26-4360-a9f5-4d2a276f3639))
-  (fp_line (start -6.65 -1.4) (end 6.65 -1.4) (layer "F.Fab") (width 0.1) (tstamp 4fa52205-d91c-42ea-81ef-043a0f24067d))
-  (fp_line (start -6.5 -1.4) (end -6 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 505415d3-dd20-4359-996c-674b21e56633))
-  (fp_line (start 6.65 -1.4) (end 6.65 -1.1) (layer "F.Fab") (width 0.1) (tstamp 5282c34b-afb1-4d79-8be7-785db35603f6))
-  (fp_line (start 7.5 -1.1) (end 7.5 1.3) (layer "F.Fab") (width 0.1) (tstamp 54bdfa80-8f31-47ef-bb4d-14298d202949))
-  (fp_line (start -6.65 -1.1) (end -6.65 -1.4) (layer "F.Fab") (width 0.1) (tstamp 7397c101-a63f-4e3b-94a1-e70c429a3b95))
-  (fp_line (start 6.65 -1.1) (end 7.5 -1.1) (layer "F.Fab") (width 0.1) (tstamp 95616b5e-8c93-4e80-aac5-23037560a8cc))
-  (fp_line (start -6 -0.692893) (end -5.5 -1.4) (layer "F.Fab") (width 0.1) (tstamp ef3cc212-92ee-4841-8880-67f871102df7))
-  (fp_line (start -7.5 -1.1) (end -7.5 1.3) (layer "F.Fab") (width 0.1) (tstamp f6124718-3f03-45b7-b6b5-885ab25d3c91))
-  (pad "1" smd roundrect (at -6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f0785bf6-ab63-4e3d-81ae-2866ac6f9d4b))
-  (pad "2" smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 03a1c878-5c1f-4820-815d-60d0f2ff9da3))
-  (pad "3" smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3ffaa156-32e3-49d7-b388-ff2e89751ea9))
-  (pad "4" smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8031182c-7009-4e3b-9ebb-88125462e0a2))
-  (pad "5" smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4def6441-8ac7-47aa-969a-d6cb448b098a))
-  (pad "6" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d0e35717-722d-4afb-ba37-aaa26539eb26))
-  (pad "7" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 80f03534-0f00-4c16-918c-69c1c8f2c562))
-  (pad "8" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 676e3328-b746-437b-8706-bc4678d5a74e))
-  (pad "9" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dee15240-5e15-4ed6-a6b8-218414760c0b))
-  (pad "10" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f276e734-4fe8-4c39-8add-d43387c334a4))
-  (pad "11" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp efe7ed29-b810-4831-b213-07e5468a4e7c))
-  (pad "12" smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 82f63423-95d9-4400-8955-96c7abb35ecd))
-  (pad "13" smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c5e621d6-914f-405d-b713-76fb2f3500e1))
-  (pad "14" smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 82b10631-e069-48ce-b246-2ffeab649c05))
-  (pad "15" smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ffc721c5-3f2e-44fa-831c-dcb28e19379f))
-  (pad "16" smd roundrect (at 6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3172066b-5b97-4817-a6f1-57075a9ca284))
-  (pad "MP" smd roundrect (at -7.3 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp a0810980-f2a0-43f3-9f60-6c8aa9453454))
-  (pad "MP" smd roundrect (at 7.3 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp f8039a5b-0f71-40ef-a408-007a40544e3b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM16B-SURS-TF_1x16-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal.kicad_mod
index bc9868483..55eac2796 100644
--- a/Connector_JST.pretty/JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,68 +1,91 @@
-(footprint "JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM17B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c00cbdb8-b2af-45cd-ae38-4ea5d262e063)
   )
-  (fp_text value "JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e5d9eb95-5d58-4633-97cf-33402c5c563e)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7.9 -1.1) (end -7.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.05 -1.1) (end -7.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.05 -1.4) (end 7.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.05 -1.4) (end 7.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.05 -1.1) (end 7.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.01 -0.31) (end -8.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.01 -1.21) (end -7.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.16 -1.21) (end -7.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.16 -1.51) (end -6.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.91 -1.51) (end -6.91 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.01 -0.31) (end 8.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.01 -1.21) (end 7.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.16 -1.21) (end 7.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.16 -1.51) (end 6.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.84 1.41) (end 6.84 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.9 1.3) (end 7.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.9 -1.1) (end -7.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.9 -1.1) (end 7.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.8 -2.15) (end -8.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.8 2.15) (end 8.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.8 2.15) (end 8.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.8 -2.15) (end -8.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.9 -1.4) (end -6.4 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.4 -0.692893) (end -5.9 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.65 -2.503553) (end -6.4 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.4 -2.15) (end -6.15 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.15 -2.503553) (end -6.65 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -6.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 1.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 2.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 3.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 4.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 5.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 6.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 7.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3fd6594c-0fea-48cd-b61d-6950ec47efa7)
   )
-  (fp_line (start 8.01 -1.21) (end 7.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 1f51e83d-0aa9-4cd2-a0b3-87b16838f699))
-  (fp_line (start -7.16 -1.51) (end -6.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 214f2b79-74fb-4024-8411-69f05fa77cbe))
-  (fp_line (start -6.65 -2.503553) (end -6.4 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 30db9f4d-72e3-41b7-8116-5da66d2d13fb))
-  (fp_line (start -8.01 -0.31) (end -8.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 3b0bb943-74cf-4930-b694-f180c4a75463))
-  (fp_line (start -6.15 -2.503553) (end -6.65 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 78f4242b-d328-4894-b7f9-8b68ae87b6f2))
-  (fp_line (start -6.4 -2.15) (end -6.15 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 796dee5c-e270-428f-a046-562cb256f08d))
-  (fp_line (start -6.91 -1.51) (end -6.91 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 8e560505-cf65-4e34-94f9-192148008caf))
-  (fp_line (start 7.16 -1.21) (end 7.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 8f6d842f-c71b-4b0d-a796-8810fd679870))
-  (fp_line (start -7.16 -1.21) (end -7.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp a6748fc1-ae77-408b-9c80-37a38650c69a))
-  (fp_line (start 7.16 -1.51) (end 6.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp d040935a-9b46-41fc-9bc7-adfa3f7e7041))
-  (fp_line (start -8.01 -1.21) (end -7.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp de024513-455a-4d31-9c68-863cbab53b83))
-  (fp_line (start 8.01 -0.31) (end 8.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp eeaa49ca-d460-45fa-b920-70e5c57de6c0))
-  (fp_line (start -6.84 1.41) (end 6.84 1.41) (layer "F.SilkS") (width 0.12) (tstamp f58de8f8-7c70-4a11-8347-d2888b2410c7))
-  (fp_line (start -8.8 -2.15) (end -8.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 24c1f379-3d6d-4827-b498-da0f57ff2872))
-  (fp_line (start -8.8 2.15) (end 8.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 2fbba73d-5451-4366-a84c-893fdd3b8d1f))
-  (fp_line (start 8.8 2.15) (end 8.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 5bd589c5-3a8c-4557-b1d3-ecc2ab862396))
-  (fp_line (start 8.8 -2.15) (end -8.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 7a8d430e-5293-427f-aeea-87b1d6575012))
-  (fp_line (start 7.9 -1.1) (end 7.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 278d2435-b916-4825-93a3-4b747925aa13))
-  (fp_line (start -7.9 -1.1) (end -7.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp 5e3360a9-738a-4de2-9125-12c476108f4a))
-  (fp_line (start -7.9 -1.1) (end -7.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 6619ffdb-9b8f-4dde-8ce5-0726a4861d8d))
-  (fp_line (start -6.9 -1.4) (end -6.4 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 72c074a0-bd96-4f6e-a7f4-4bc0e70cacdf))
-  (fp_line (start -6.4 -0.692893) (end -5.9 -1.4) (layer "F.Fab") (width 0.1) (tstamp 9dbeda98-4532-4f67-89ac-70928f21880d))
-  (fp_line (start 7.05 -1.4) (end 7.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp b1e784d3-a262-42f5-a940-22a62d246716))
-  (fp_line (start -7.9 1.3) (end 7.9 1.3) (layer "F.Fab") (width 0.1) (tstamp b870e9f6-d14b-4390-ba67-0d656739cc1b))
-  (fp_line (start -7.05 -1.1) (end -7.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp c2078da9-a739-4366-9c6a-7216f785d266))
-  (fp_line (start 7.05 -1.1) (end 7.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp dbcecc9e-0b62-4e87-bc72-ca4716de3027))
-  (fp_line (start -7.05 -1.4) (end 7.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp e5c40db4-2c43-43e2-8f08-06a6297b4523))
-  (pad "1" smd roundrect (at -6.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 014c10fa-26fe-43b5-99f0-a130886bb212))
-  (pad "2" smd roundrect (at -5.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e5f9afd5-9b28-4d38-b18e-1b28e8996ab9))
-  (pad "3" smd roundrect (at -4.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 64645242-ae67-4ad4-b9c8-952e9802a00b))
-  (pad "4" smd roundrect (at -4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 25c25ece-af06-48f2-bec1-f270dd428d24))
-  (pad "5" smd roundrect (at -3.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 01593689-d597-49d2-a385-3e9525378493))
-  (pad "6" smd roundrect (at -2.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1eed83d6-002f-4c49-b975-de6df5de4486))
-  (pad "7" smd roundrect (at -1.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4ac083ea-17af-41b4-a221-7dae6b63f6d6))
-  (pad "8" smd roundrect (at -0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5e0f8386-f05d-400d-bf8b-b3bd17c48cd9))
-  (pad "9" smd roundrect (at 0 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3e9d69b6-f4dd-42d8-a457-a516d3ddd4c0))
-  (pad "10" smd roundrect (at 0.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 92a84ad2-e30e-41cf-b6c5-d1b87d19661d))
-  (pad "11" smd roundrect (at 1.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0c4ff2e0-78c0-4e2e-8a2a-ec3e9bb27ca1))
-  (pad "12" smd roundrect (at 2.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ba9d32c4-ce64-46fe-88c1-0a5516a14bb8))
-  (pad "13" smd roundrect (at 3.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2a01b489-ecd5-46f7-b6ea-0908d87a1571))
-  (pad "14" smd roundrect (at 4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0ac8e937-d721-4b9e-bc7b-56a09716375c))
-  (pad "15" smd roundrect (at 4.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ffd9493b-18d4-4043-8d99-3607e53b9095))
-  (pad "16" smd roundrect (at 5.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 058e5431-e259-4b85-9e57-c1fe7c66b9cc))
-  (pad "17" smd roundrect (at 6.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c854b24b-a447-49d6-a456-86a2e56d31df))
-  (pad "MP" smd roundrect (at -7.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 88c43344-e548-47b6-94a9-52b94c28521a))
-  (pad "MP" smd roundrect (at 7.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp ab5fe37c-be70-455b-9ea3-bb60241be755))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM17B-SURS-TF_1x17-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal.kicad_mod
index 5f2a821e0..7961ba204 100644
--- a/Connector_JST.pretty/JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,71 +1,94 @@
-(footprint "JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM20B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1b3cb8f9-67c5-4036-b9cd-5939beaa84e1)
   )
-  (fp_text value "JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 98e12193-b7a0-42ea-bbad-955a7ae5f861)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -9.1 -1.1) (end -8.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -1.1) (end -8.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -1.4) (end 8.25 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -1.4) (end 8.25 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -1.1) (end 9.1 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.21 -0.31) (end -9.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.21 -1.21) (end -8.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.36 -1.21) (end -8.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.36 -1.51) (end -8.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.11 -1.51) (end -8.11 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.21 -0.31) (end 9.21 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.21 -1.21) (end 8.36 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.36 -1.21) (end 8.36 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.36 -1.51) (end 8.11 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.04 1.41) (end 8.04 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.1 1.3) (end 9.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.1 -1.1) (end -9.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.1 -1.1) (end 9.1 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 -2.15) (end -10 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10 2.15) (end 10 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 2.15) (end 10 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 -2.15) (end -10 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.1 -1.4) (end -7.6 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.6 -0.692893) (end -7.1 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.85 -2.503553) (end -7.6 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.6 -2.15) (end -7.35 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.35 -2.503553) (end -7.85 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -7.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 6.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 7.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 8.9 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 74c3be51-1b53-42fc-93d0-15db32c643a9)
   )
-  (fp_line (start 9.21 -0.31) (end 9.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 1b8d1156-7b17-4e6b-b2fb-89b5696a529f))
-  (fp_line (start -8.36 -1.21) (end -8.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 1c6e8a57-9f3c-41d3-b450-4d32f322ea90))
-  (fp_line (start -7.6 -2.15) (end -7.35 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 210a5a4f-d145-46f6-9235-995fc741f66f))
-  (fp_line (start 9.21 -1.21) (end 8.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 3b61fa87-7fb2-4643-9d9a-72a44168650b))
-  (fp_line (start -8.11 -1.51) (end -8.11 -1.65) (layer "F.SilkS") (width 0.12) (tstamp 4f19f5bc-c28e-4dbd-bdd7-4f9b426ea062))
-  (fp_line (start -7.85 -2.503553) (end -7.6 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 541bd50e-fe47-4bcc-9931-398fd04db679))
-  (fp_line (start -9.21 -0.31) (end -9.21 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 5e6a2457-1ed4-44d9-bdbb-86f4cda915ff))
-  (fp_line (start -8.36 -1.51) (end -8.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 7b06ee20-f504-47ca-bea7-443d089bae74))
-  (fp_line (start -8.04 1.41) (end 8.04 1.41) (layer "F.SilkS") (width 0.12) (tstamp 8f3ecdc5-ceef-4280-bf28-261087c1bb43))
-  (fp_line (start -7.35 -2.503553) (end -7.85 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp a63de3df-07d3-4117-a7aa-7707495dc288))
-  (fp_line (start 8.36 -1.51) (end 8.11 -1.51) (layer "F.SilkS") (width 0.12) (tstamp d199c286-92a2-4b2b-958b-fbcd497016fb))
-  (fp_line (start -9.21 -1.21) (end -8.36 -1.21) (layer "F.SilkS") (width 0.12) (tstamp dbf611ba-4025-42c7-87d4-cb4f5b9e3814))
-  (fp_line (start 8.36 -1.21) (end 8.36 -1.51) (layer "F.SilkS") (width 0.12) (tstamp fb5ef924-41a6-4cf9-84a5-66b370c8a302))
-  (fp_line (start 10 -2.15) (end -10 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 6d35937f-1760-4dc4-a4f6-3b96b17002a2))
-  (fp_line (start 10 2.15) (end 10 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp d013a589-9677-4d6d-aa39-c4ecf6dd5017))
-  (fp_line (start -10 -2.15) (end -10 2.15) (layer "F.CrtYd") (width 0.05) (tstamp d7140cf7-6b3f-42fa-a04d-e853d61092dd))
-  (fp_line (start -10 2.15) (end 10 2.15) (layer "F.CrtYd") (width 0.05) (tstamp e7eb3b7a-71cf-4bf1-bce1-2e9394518f1e))
-  (fp_line (start -8.25 -1.4) (end 8.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp 06b76bab-28b4-4ce6-880d-fd92b2249467))
-  (fp_line (start -8.1 -1.4) (end -7.6 -0.692893) (layer "F.Fab") (width 0.1) (tstamp 179d19d5-cddf-4ab1-831c-42337e6e07b9))
-  (fp_line (start 9.1 -1.1) (end 9.1 1.3) (layer "F.Fab") (width 0.1) (tstamp 5ee70c29-8b3d-4a56-a717-bf281e58072d))
-  (fp_line (start 8.25 -1.4) (end 8.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp 717fed82-5b6e-43e9-9633-a5d617859500))
-  (fp_line (start -8.25 -1.1) (end -8.25 -1.4) (layer "F.Fab") (width 0.1) (tstamp 7faabf64-2a71-467e-a98c-1434170e1d93))
-  (fp_line (start 8.25 -1.1) (end 9.1 -1.1) (layer "F.Fab") (width 0.1) (tstamp a39e4dc5-2bcb-4dc8-881e-a020f0b6297a))
-  (fp_line (start -9.1 1.3) (end 9.1 1.3) (layer "F.Fab") (width 0.1) (tstamp a5d39044-f4c7-45f3-9c9a-2a78f26db19a))
-  (fp_line (start -9.1 -1.1) (end -8.25 -1.1) (layer "F.Fab") (width 0.1) (tstamp bae35c69-61e1-4142-8b5b-84f23a274b63))
-  (fp_line (start -7.6 -0.692893) (end -7.1 -1.4) (layer "F.Fab") (width 0.1) (tstamp bb6b1f4b-d038-4b89-8f99-8692b819ae73))
-  (fp_line (start -9.1 -1.1) (end -9.1 1.3) (layer "F.Fab") (width 0.1) (tstamp f42cf544-fb50-4a69-81bb-1474669e4e08))
-  (pad "1" smd roundrect (at -7.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0ab1cd4c-d26d-4400-bcc4-6c78c05c8c60))
-  (pad "2" smd roundrect (at -6.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 346e43ad-2bd3-4512-8468-c662735bbedb))
-  (pad "3" smd roundrect (at -6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 370eecf8-f15e-432e-8a1f-1ff888fe7547))
-  (pad "4" smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ce8f175b-e4e8-4d37-9e5a-08727c62c35b))
-  (pad "5" smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b149da1d-e31f-47e6-8df4-018bfd2238a0))
-  (pad "6" smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2359b007-949c-4c2a-8357-963c8539fc7a))
-  (pad "7" smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cec62c05-860b-4e4f-b7af-f169ef71eb5d))
-  (pad "8" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1911bb03-9b7d-4788-a1fc-00ab61802382))
-  (pad "9" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e00cac46-b7f7-43fe-84c6-3104fc5edc05))
-  (pad "10" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e2b51bfe-b262-4906-aad3-60f2b9cd6042))
-  (pad "11" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 21eb97d0-bc31-447c-8fdd-b086dda78a1c))
-  (pad "12" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d2025b5e-2727-48b8-aaca-5e52bd6f962e))
-  (pad "13" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 75a9fad9-dc41-432c-843f-167b82ce48dc))
-  (pad "14" smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a2296cec-2261-429e-a732-5ee7a6e72b1a))
-  (pad "15" smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 484b3ac0-95bd-46e2-8dcb-6843ad296ca1))
-  (pad "16" smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7a594362-8839-4987-a113-5470c82a5072))
-  (pad "17" smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 45e79455-f3ff-467e-8f7d-e79bcb9c1a40))
-  (pad "18" smd roundrect (at 6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6ed869cc-8832-4b8c-84d6-132aaadc9124))
-  (pad "19" smd roundrect (at 6.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 575246ab-f39f-47b5-9471-2384fe11b838))
-  (pad "20" smd roundrect (at 7.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f796a3ed-1f41-4e43-8e77-4b241df00111))
-  (pad "MP" smd roundrect (at 8.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 4c48bb7e-17cc-4c44-bf3e-d1ac806b514a))
-  (pad "MP" smd roundrect (at -8.9 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 56de3063-f091-4f9e-b424-8c5ef7510d2d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM20B-SURS-TF_1x20-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal.kicad_mod
index a36be95a2..56ea6ebfe 100644
--- a/Connector_JST.pretty/JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal.kicad_mod
@@ -1,73 +1,96 @@
-(footprint "JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST SUR series connector, SM22B-SURS-TF (http://www.jst-mfg.com/product/pdf/eng/eSUR.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST SUR top entry")
+  (tags "connector JST SUR horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -2.85) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7889e6ab-76a1-4457-bdab-e816ae243bb2)
   )
-  (fp_text value "JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal" (at 0 2.85) (layer "F.Fab")
+  (fp_text value JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal (at 0 2.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 64097d71-72d7-4b75-8efa-8bd9764ae1bd)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -9.9 -1.1) (end -9.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.05 -1.1) (end -9.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.05 -1.4) (end 9.05 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.05 -1.4) (end 9.05 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.05 -1.1) (end 9.9 -1.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.01 -0.31) (end -10.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.01 -1.21) (end -9.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.16 -1.21) (end -9.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.16 -1.51) (end -8.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.91 -1.51) (end -8.91 -1.65)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.01 -0.31) (end 10.01 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.01 -1.21) (end 9.16 -1.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.16 -1.21) (end 9.16 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.16 -1.51) (end 8.91 -1.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.84 1.41) (end 8.84 1.41)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.9 1.3) (end 9.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.9 -1.1) (end -9.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.9 -1.1) (end 9.9 1.3)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.8 -2.15) (end -10.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.8 2.15) (end 10.8 2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.8 2.15) (end 10.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.8 -2.15) (end -10.8 -2.15)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.9 -1.4) (end -8.4 -0.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.4 -0.692893) (end -7.9 -1.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.65 -2.503553) (end -8.4 -2.15)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.4 -2.15) (end -8.15 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.15 -2.503553) (end -8.65 -2.503553)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (pad 1 smd roundrect (at -8.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -7.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 6.8 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 21 smd roundrect (at 7.6 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 22 smd roundrect (at 8.4 -1.15) (size 0.5 1) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad MP smd roundrect (at 9.7 0.8) (size 1.2 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b530aac1-9d89-4461-9516-232742ff5bbf)
   )
-  (fp_line (start -10.01 -1.21) (end -9.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 1a526269-9b81-4620-8611-83cc7b8f052a))
-  (fp_line (start -8.65 -2.503553) (end -8.4 -2.15) (layer "F.SilkS") (width 0.12) (tstamp 1d25c827-da33-4bcf-a5e7-6ca93fe61a82))
-  (fp_line (start -10.01 -0.31) (end -10.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 3ed00a5f-ebbd-4c1b-954b-a572e7e69adc))
-  (fp_line (start -9.16 -1.51) (end -8.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 46b343d1-fecb-4aa8-8e28-f515b19c2dfc))
-  (fp_line (start 10.01 -1.21) (end 9.16 -1.21) (layer "F.SilkS") (width 0.12) (tstamp 53d24071-3c28-4f44-a9c8-a1b97363f355))
-  (fp_line (start -8.15 -2.503553) (end -8.65 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 85bb8a74-bdd9-46e8-b83d-342b4214c122))
-  (fp_line (start 9.16 -1.51) (end 8.91 -1.51) (layer "F.SilkS") (width 0.12) (tstamp 8c6a0a13-e780-4c47-86e3-71b14b835188))
-  (fp_line (start -8.4 -2.15) (end -8.15 -2.503553) (layer "F.SilkS") (width 0.12) (tstamp 9cb88927-276e-4213-9786-293783f4b3c2))
-  (fp_line (start -8.84 1.41) (end 8.84 1.41) (layer "F.SilkS") (width 0.12) (tstamp a259fe03-1395-4348-a587-72f98a4442aa))
-  (fp_line (start 9.16 -1.21) (end 9.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp c536fc01-7200-40a8-9f8d-8b2b4430ab9e))
-  (fp_line (start -9.16 -1.21) (end -9.16 -1.51) (layer "F.SilkS") (width 0.12) (tstamp d2fd1222-b3c6-4fd5-b643-896c692a438a))
-  (fp_line (start -8.91 -1.51) (end -8.91 -1.65) (layer "F.SilkS") (width 0.12) (tstamp dfdd8419-bf9f-40f6-89bc-60e4a5814566))
-  (fp_line (start 10.01 -0.31) (end 10.01 -1.21) (layer "F.SilkS") (width 0.12) (tstamp fbe00512-b50e-4378-a1ee-619c4712db62))
-  (fp_line (start 10.8 -2.15) (end -10.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 26306386-6b36-46f0-aed0-e5973015a059))
-  (fp_line (start -10.8 -2.15) (end -10.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp a4201a4a-6c87-4f82-9428-65a34b64ebdd))
-  (fp_line (start -10.8 2.15) (end 10.8 2.15) (layer "F.CrtYd") (width 0.05) (tstamp df8863f1-d854-4631-810f-647bf4314b16))
-  (fp_line (start 10.8 2.15) (end 10.8 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp e6e28d11-202d-4867-abd3-079ed986e864))
-  (fp_line (start -9.9 1.3) (end 9.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 23618d41-0853-4be4-8d27-c328de4db3eb))
-  (fp_line (start -9.9 -1.1) (end -9.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp 4377200a-ebcf-4694-a6c0-788bda70e28a))
-  (fp_line (start -8.4 -0.692893) (end -7.9 -1.4) (layer "F.Fab") (width 0.1) (tstamp 4896ab05-8797-4438-8ff8-c478ab927507))
-  (fp_line (start -9.05 -1.4) (end 9.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp 5332f216-b5e7-4625-89f1-e5b152476669))
-  (fp_line (start 9.9 -1.1) (end 9.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 5dbe5495-f8bd-4fdf-bb62-7ec793e1fa7e))
-  (fp_line (start 9.05 -1.4) (end 9.05 -1.1) (layer "F.Fab") (width 0.1) (tstamp 63c5de28-f7d5-4800-b371-555ab3abc2e1))
-  (fp_line (start -9.9 -1.1) (end -9.9 1.3) (layer "F.Fab") (width 0.1) (tstamp 6ca89635-756d-4f54-a000-d7acbd993c90))
-  (fp_line (start 9.05 -1.1) (end 9.9 -1.1) (layer "F.Fab") (width 0.1) (tstamp 6f32027e-f1bd-4287-b570-e4ea2878fa51))
-  (fp_line (start -8.9 -1.4) (end -8.4 -0.692893) (layer "F.Fab") (width 0.1) (tstamp af045c17-0cee-48ab-84f9-a050c84d2737))
-  (fp_line (start -9.05 -1.1) (end -9.05 -1.4) (layer "F.Fab") (width 0.1) (tstamp e8dd4974-b761-4df2-9b5b-c814cc07a581))
-  (pad "1" smd roundrect (at -8.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6461f10f-679b-40dd-8c9e-377081fed5c9))
-  (pad "2" smd roundrect (at -7.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cc0b2767-d1d3-42bf-902d-71c1266c3650))
-  (pad "3" smd roundrect (at -6.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ac5c1088-5118-49d1-91cb-ad1c577175ab))
-  (pad "4" smd roundrect (at -6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f0d4e97-0db9-4251-8ad7-81ad8e16a9c7))
-  (pad "5" smd roundrect (at -5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c43a62f8-39bf-448d-a72f-3d5f426f4237))
-  (pad "6" smd roundrect (at -4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 69aaeb35-0739-4712-97d6-0f0304528f36))
-  (pad "7" smd roundrect (at -3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b8170541-40e3-4134-932a-485186b0a56b))
-  (pad "8" smd roundrect (at -2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cabee3fb-5d71-4f75-a00b-81fd458872f9))
-  (pad "9" smd roundrect (at -2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b61e1cf1-4525-47fe-9ced-b3cc46e26cb9))
-  (pad "10" smd roundrect (at -1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 13db082e-1f7b-4942-ae00-33617278735b))
-  (pad "11" smd roundrect (at -0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6bdc8bfb-b534-497b-bc01-893de77528a1))
-  (pad "12" smd roundrect (at 0.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 24ab3fd7-64a9-4476-a732-2f0eee9fa285))
-  (pad "13" smd roundrect (at 1.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d2cd5617-307a-42c7-a4e7-1353beef5d1b))
-  (pad "14" smd roundrect (at 2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp edf6cccb-0b5f-4874-8a55-488814c8862a))
-  (pad "15" smd roundrect (at 2.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ea6578e2-62b3-4ce2-93fa-90bc73e1f647))
-  (pad "16" smd roundrect (at 3.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 897767bd-a5e3-43a1-b857-206d012aa4bc))
-  (pad "17" smd roundrect (at 4.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5e8b2f83-501d-4bdb-9389-cfc77eea608f))
-  (pad "18" smd roundrect (at 5.2 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4d5a5fb0-cc9f-4129-8059-273b508aeb33))
-  (pad "19" smd roundrect (at 6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 53bc0870-b90b-4ed3-90d5-94fbc088f4fc))
-  (pad "20" smd roundrect (at 6.8 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 33ee1469-0158-4e72-aeaa-a1f53c96ecaf))
-  (pad "21" smd roundrect (at 7.6 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c0b78379-4496-41bb-9271-ad83b9155dbd))
-  (pad "22" smd roundrect (at 8.4 -1.15) (size 0.5 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f799f92-340e-4807-b3fa-1442bb9e8b87))
-  (pad "MP" smd roundrect (at 9.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 7fce9e3c-5ab7-4ef9-a94a-0e41fa4dcdad))
-  (pad "MP" smd roundrect (at -9.7 0.8) (size 1.2 1.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333) (tstamp 9bfc9ee2-d200-46c8-b55d-447410923128))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_SUR_SM22B-SURS-TF_1x22-1MP_P0.80mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal.kicad_mod
index 345986920..c70a9907d 100644
--- a/Connector_JST.pretty/JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal.kicad_mod
@@ -1,53 +1,73 @@
-(footprint "JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5B78AD88)
+(footprint JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST XAG series connector, SM05B-XAGKS-BN-TB (http://www.jst-mfg.com/product/pdf/eng/eXAG.pdf), generated with kicad-footprint-generator")
-  (tags "connector JST XAG top entry")
+  (tags "connector JST XAG horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -7.5) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -7.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4aed9e27-02f4-4473-aa61-ad2fa94d2627)
   )
-  (fp_text value "JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal" (at 0 7.5) (layer "F.Fab")
+  (fp_text value JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal (at 0 7.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c0987cc2-21f1-492a-8232-7ae5f5393411)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -11.15 -5.5) (end -6.55 -5.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.55 -5.5) (end -6.55 -3.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.55 -3.4) (end 6.55 -3.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.55 -3.4) (end 6.55 -5.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.55 -5.5) (end 11.15 -5.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.26 2.14) (end -11.26 -5.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.26 -5.61) (end -6.44 -5.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.44 -5.61) (end -6.44 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.44 -3.51) (end -5.91 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.91 -3.51) (end -5.91 -6.3)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.26 2.14) (end 11.26 -5.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.26 -5.61) (end 6.44 -5.61)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.44 -5.61) (end 6.44 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.44 -3.51) (end 5.91 -3.51)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.44 6.21) (end 9.44 6.21)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.15 6.1) (end 11.15 6.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.15 -5.5) (end -11.15 6.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.15 -5.5) (end 11.15 6.1)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12 -6.8) (end -12 6.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12 6.8) (end 12 6.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12 6.8) (end 12 -6.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12 -6.8) (end -12 -6.8)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 -3.4) (end -5 -2.692893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -2.692893) (end -4.5 -3.4)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5 -4.2) (size 1.3 4.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (pad 2 smd roundrect (at -2.5 -4.2) (size 1.3 4.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (pad 3 smd roundrect (at 0 -4.2) (size 1.3 4.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (pad 4 smd roundrect (at 2.5 -4.2) (size 1.3 4.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (pad 5 smd roundrect (at 5 -4.2) (size 1.3 4.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (pad MP smd roundrect (at -10.6 4.35) (size 1.8 3.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 10.6 4.35) (size 1.8 3.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3ef14b51-27ce-4ff7-9091-69230699c362)
   )
-  (fp_line (start 11.26 -5.61) (end 6.44 -5.61) (layer "F.SilkS") (width 0.12) (tstamp 0fca0349-ff90-43f9-bb71-95ce59ccc7a9))
-  (fp_line (start -11.26 2.14) (end -11.26 -5.61) (layer "F.SilkS") (width 0.12) (tstamp 13c019e7-afe6-4e40-861d-f2b16fe91aaa))
-  (fp_line (start -6.44 -5.61) (end -6.44 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 350d7e57-c1a2-4ab0-a4d8-6024c4a2b692))
-  (fp_line (start -5.91 -3.51) (end -5.91 -6.3) (layer "F.SilkS") (width 0.12) (tstamp 4b5f7c51-9aa2-4c89-b1fa-185050ff609b))
-  (fp_line (start 6.44 -5.61) (end 6.44 -3.51) (layer "F.SilkS") (width 0.12) (tstamp 54c1e245-5b16-4191-9dd3-365c9eba0e3d))
-  (fp_line (start 11.26 2.14) (end 11.26 -5.61) (layer "F.SilkS") (width 0.12) (tstamp b6205905-77ff-4bee-bf2d-aa6a0c892703))
-  (fp_line (start -9.44 6.21) (end 9.44 6.21) (layer "F.SilkS") (width 0.12) (tstamp c8a57310-3ced-45e1-a92f-77538ac6c0e7))
-  (fp_line (start 6.44 -3.51) (end 5.91 -3.51) (layer "F.SilkS") (width 0.12) (tstamp e6d873a7-c12d-4797-8346-f044aa5b73a3))
-  (fp_line (start -11.26 -5.61) (end -6.44 -5.61) (layer "F.SilkS") (width 0.12) (tstamp ebf70c85-e382-4d33-97b1-af9376374fd2))
-  (fp_line (start -6.44 -3.51) (end -5.91 -3.51) (layer "F.SilkS") (width 0.12) (tstamp ec8234cd-247e-4b6f-b170-7482f5264089))
-  (fp_line (start -12 -6.8) (end -12 6.8) (layer "F.CrtYd") (width 0.05) (tstamp 4494c811-1c64-4a65-a440-0cc373ab84ac))
-  (fp_line (start 12 6.8) (end 12 -6.8) (layer "F.CrtYd") (width 0.05) (tstamp 86dfd455-69a1-4f7d-866c-0882862e33f6))
-  (fp_line (start -12 6.8) (end 12 6.8) (layer "F.CrtYd") (width 0.05) (tstamp a996d3a3-42ed-4138-a3b8-1788f7967416))
-  (fp_line (start 12 -6.8) (end -12 -6.8) (layer "F.CrtYd") (width 0.05) (tstamp e3b63a3e-bb0d-4dd1-acdd-61c7c4114aa8))
-  (fp_line (start 11.15 -5.5) (end 11.15 6.1) (layer "F.Fab") (width 0.1) (tstamp 0043bfc8-249f-4060-9c24-b91d97446584))
-  (fp_line (start -6.55 -3.4) (end 6.55 -3.4) (layer "F.Fab") (width 0.1) (tstamp 20331f98-6845-4024-a0ca-441dff55cfba))
-  (fp_line (start 6.55 -5.5) (end 11.15 -5.5) (layer "F.Fab") (width 0.1) (tstamp 342b415a-48c3-4220-8d69-82bb608da497))
-  (fp_line (start -11.15 6.1) (end 11.15 6.1) (layer "F.Fab") (width 0.1) (tstamp 6b6ad831-9c71-4a7d-878c-ad4e94d6150a))
-  (fp_line (start -11.15 -5.5) (end -11.15 6.1) (layer "F.Fab") (width 0.1) (tstamp 7f8450bf-19cb-40b6-b1ac-4f271d31983e))
-  (fp_line (start -5.5 -3.4) (end -5 -2.692893) (layer "F.Fab") (width 0.1) (tstamp a1019c98-c657-4f49-a8ca-16dd749f3f10))
-  (fp_line (start -11.15 -5.5) (end -6.55 -5.5) (layer "F.Fab") (width 0.1) (tstamp ad16475a-0b09-43c4-bbf3-0d2042a29af3))
-  (fp_line (start -5 -2.692893) (end -4.5 -3.4) (layer "F.Fab") (width 0.1) (tstamp c9b477c1-eda1-4d8e-8162-f4314abc00ce))
-  (fp_line (start -6.55 -5.5) (end -6.55 -3.4) (layer "F.Fab") (width 0.1) (tstamp cea2ede1-b1ff-4191-865f-978cc5f2adc3))
-  (fp_line (start 6.55 -3.4) (end 6.55 -5.5) (layer "F.Fab") (width 0.1) (tstamp f46a5860-9a40-46a0-8a34-306af05adf62))
-  (pad "1" smd roundrect (at -5 -4.2) (size 1.3 4.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) (tstamp 4ca0737b-bde2-4159-ac3a-cd1ff9c0b3a8))
-  (pad "2" smd roundrect (at -2.5 -4.2) (size 1.3 4.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) (tstamp 55849c26-3dd8-47f4-9804-07053532a649))
-  (pad "3" smd roundrect (at 0 -4.2) (size 1.3 4.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) (tstamp be363bdb-de16-4841-ad66-6b7da22b83b3))
-  (pad "4" smd roundrect (at 2.5 -4.2) (size 1.3 4.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) (tstamp e4d08291-2dc5-4ed1-b2ef-5d1a0b69a249))
-  (pad "5" smd roundrect (at 5 -4.2) (size 1.3 4.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) (tstamp c5ca840f-5ad7-494a-9875-f401d721ae22))
-  (pad "MP" smd roundrect (at 10.6 4.35) (size 1.8 3.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 1103393c-dbb2-43e9-b4e3-86cee94a9e4a))
-  (pad "MP" smd roundrect (at -10.6 4.35) (size 1.8 3.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 579cff97-cf21-425c-87c5-a1fca6b53e5a))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XAG_SM05B-XAGKS-BN-TB_1x05-1MP_P2.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical.kicad_mod
index 89030bd54..16b388ffb 100644
--- a/Connector_JST.pretty/JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,50 +1,70 @@
-(footprint "JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM02B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5ffb8e63-0b32-4fbc-8ecf-f07cb1ea6969)
   )
-  (fp_text value "JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 91b80d59-7340-4b0b-9301-3837d2c50bbc)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -3.75 2.25) (end 3.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.86 -0.39) (end -3.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.86 2.36) (end -1.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.41 2.36) (end -1.41 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.86 -0.39) (end 3.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.86 2.36) (end 1.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.19 -3.66) (end 2.19 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.75 -3.55) (end 3.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 2.25) (end -3.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 2.25) (end 3.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -4.45) (end -4.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.75 4.45) (end 4.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.75 4.45) (end 4.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.75 -4.45) (end -4.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.25 2.25) (end -0.75 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 1.542893) (end -0.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 3.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8b7b9403-c667-4a86-80ae-a9979d354bf6)
   )
-  (fp_line (start 3.86 2.36) (end 1.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp 477d0f4b-f741-439d-8fc2-6da89b92ccaf))
-  (fp_line (start 3.86 -0.39) (end 3.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp 72dc0652-7159-441a-ab77-683ed2eaa46d))
-  (fp_line (start -2.19 -3.66) (end 2.19 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 9b01d666-6680-41cc-ae51-f3b9caf0b915))
-  (fp_line (start -3.86 2.36) (end -1.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp b181fdf4-bdd3-4927-85fc-9660f22a52f8))
-  (fp_line (start -3.86 -0.39) (end -3.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp c38ac64f-1502-433e-a95b-793139acd53f))
-  (fp_line (start -1.41 2.36) (end -1.41 3.95) (layer "F.SilkS") (width 0.12) (tstamp e9ec78b9-f3a2-4491-b55f-53f8cac04207))
-  (fp_line (start 4.75 4.45) (end 4.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 56d3fe21-8a23-4f82-b5d9-bd638e13adfc))
-  (fp_line (start -4.75 -4.45) (end -4.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 6b99a710-1f84-4c0a-bbbe-8faac2224973))
-  (fp_line (start -4.75 4.45) (end 4.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 86ad2f83-cc5f-4474-9e56-7cc8be7a1d4a))
-  (fp_line (start 4.75 -4.45) (end -4.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp bcf8c740-60f9-4ad5-9e8d-a512ebea353e))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 028f154d-7a06-44e8-b0ca-5d33f41368c7))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0723e100-5599-4000-b5bb-e13661e2fbbb))
-  (fp_line (start -3.75 2.25) (end 3.75 2.25) (layer "F.Fab") (width 0.1) (tstamp 1b41b6c2-877e-4cad-bb26-e463bba2d47f))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 26c27ed8-1251-4ab7-b80e-73c75b016d2c))
-  (fp_line (start -3.75 2.25) (end -3.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 2cec0528-9bfd-49e3-a5e2-bebdf4cf4bdc))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 441eb678-6002-4f26-ad14-305b44683574))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4f5f481d-454c-4f21-8486-438a391ed015))
-  (fp_line (start -3.75 -3.55) (end 3.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 54f60357-a65c-4add-81a9-159f3aa6d891))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp 6a6a1583-f966-4957-b32c-03e5600ec9f8))
-  (fp_line (start -1.25 2.25) (end -0.75 1.542893) (layer "F.Fab") (width 0.1) (tstamp 7282a315-40f4-4586-bd6a-8f7d697bfa36))
-  (fp_line (start 3.75 2.25) (end 3.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 8ec89016-106e-4401-8d54-1f84b3e79e8b))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp a5db702a-2eb2-4bf8-b0d6-836148342fc6))
-  (fp_line (start -0.75 1.542893) (end -0.25 2.25) (layer "F.Fab") (width 0.1) (tstamp aac2b0b6-3690-499f-a0c3-3f1de270850c))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp c9b885fd-3e8d-44a7-8813-e3548c4da1de))
-  (pad "1" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e630019f-426e-46a0-8c73-7bc2aac672e4))
-  (pad "2" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ba070a7e-93bc-4bd3-9968-f7f03c498199))
-  (pad "MP" smd roundrect (at -3.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp b76f5d13-c515-47e6-828e-93d88af180ae))
-  (pad "MP" smd roundrect (at 3.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e606d16a-9154-4b72-81a6-45c96ebd5ee8))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM02B-ZESS-TBT_1x02-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical.kicad_mod
index 87bcd032f..be539e1f9 100644
--- a/Connector_JST.pretty/JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,55 +1,79 @@
-(footprint "JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM03B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp dfbf33b8-f7fd-447a-b023-596ddf722bb7)
   )
-  (fp_text value "JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 52984d38-9d55-4864-ad34-5ad982b3767e)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -4.5 2.25) (end 4.5 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.61 -0.39) (end -4.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.61 2.36) (end -2.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.16 2.36) (end -2.16 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 -0.39) (end 4.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 2.36) (end 2.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.94 -3.66) (end 2.94 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.5 -3.55) (end 4.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 2.25) (end -4.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.5 2.25) (end 4.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -0.5) (end -1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 0) (end -1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 0) (end -1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.5) (end -1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -0.5) (end 1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 0) (end 1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 0) (end 1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -0.5) (end 1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -4.45) (end -5.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 4.45) (end 5.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.5 4.45) (end 5.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.5 -4.45) (end -5.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2 2.25) (end -1.5 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 1.542893) (end -1 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 4.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 416b8933-d24e-4750-a92d-b3f53b10bf86)
   )
-  (fp_line (start -2.94 -3.66) (end 2.94 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 20ef9709-a013-4863-8e18-de0336d94d0b))
-  (fp_line (start -4.61 -0.39) (end -4.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp 306dd7c5-f094-4216-b0e8-911b38028528))
-  (fp_line (start -2.16 2.36) (end -2.16 3.95) (layer "F.SilkS") (width 0.12) (tstamp 8bcb6e6c-f9ef-416e-9234-d30c75eddcf6))
-  (fp_line (start 4.61 -0.39) (end 4.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp a9073325-6134-4a74-8e7f-a6460068a244))
-  (fp_line (start -4.61 2.36) (end -2.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp a9eef898-456c-4e31-a430-8a41b1eab36e))
-  (fp_line (start 4.61 2.36) (end 2.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp c3ba23d9-cf80-45eb-b64b-6b836708b224))
-  (fp_line (start -5.5 4.45) (end 5.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 7ace8459-2eab-432d-a7eb-f631b4428aa9))
-  (fp_line (start -5.5 -4.45) (end -5.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp d8423435-14ef-4a25-ac17-a45733e040db))
-  (fp_line (start 5.5 4.45) (end 5.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp e7eb37a5-ca96-4f2a-bdd0-d5b8ac8d2d9f))
-  (fp_line (start 5.5 -4.45) (end -5.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp fbc2735e-553e-4570-b377-698a879eb75e))
-  (fp_line (start -1.25 -0.5) (end -1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0e4e7363-f752-497f-a45f-5d1b32f8af3c))
-  (fp_line (start 1.25 -0.5) (end 1.25 0) (layer "F.Fab") (width 0.1) (tstamp 0ee93059-ca49-46b6-af1c-84dd44fbf2c2))
-  (fp_line (start -1.25 0) (end -1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 242af83e-efe7-42d0-b906-3402cab90fcc))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp 2771d264-9b0e-4aef-866a-9926a908b16e))
-  (fp_line (start 1.75 0) (end 1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3d9a62bd-afa7-4b60-add2-c838c24a6fda))
-  (fp_line (start -4.5 2.25) (end 4.5 2.25) (layer "F.Fab") (width 0.1) (tstamp 47b9ff2e-0e29-4655-958f-ac73f6661b71))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7700fbc5-18f2-4546-9ca9-9917ab8358cd))
-  (fp_line (start -1.75 0) (end -1.25 0) (layer "F.Fab") (width 0.1) (tstamp 7e71e8c6-be31-46f3-bbd0-1750a9851aa6))
-  (fp_line (start 1.25 0) (end 1.75 0) (layer "F.Fab") (width 0.1) (tstamp 93814033-43bc-4c24-8e78-a0c8119e6d8b))
-  (fp_line (start -1.5 1.542893) (end -1 2.25) (layer "F.Fab") (width 0.1) (tstamp 9474a534-9891-4a82-90dd-243a617b4908))
-  (fp_line (start -2 2.25) (end -1.5 1.542893) (layer "F.Fab") (width 0.1) (tstamp a571484d-e7de-4c9a-a882-2c1876c9dc78))
-  (fp_line (start 1.75 -0.5) (end 1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp a880e19f-b654-43fb-adad-78d63052e0ef))
-  (fp_line (start 4.5 2.25) (end 4.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp ba210e00-e976-4890-bf5c-eeb50b5a18d9))
-  (fp_line (start -4.5 2.25) (end -4.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp bc2998f0-0a23-4d15-9c58-2bbf7d0f0b08))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp c149545a-586f-4b05-b3de-558309352f32))
-  (fp_line (start -4.5 -3.55) (end 4.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp ca813b91-f31b-4528-bb73-e85946e28685))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp ceac2ef5-9918-469c-b063-31f043bc57a1))
-  (fp_line (start -1.75 -0.5) (end -1.75 0) (layer "F.Fab") (width 0.1) (tstamp d49e7fee-b6dc-45ec-8023-8dc41b9f559c))
-  (pad "1" smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8ee21108-6d99-480c-9862-a44c51ed131e))
-  (pad "2" smd roundrect (at 0 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp daf57b7e-56d1-4637-876e-f187a78574f4))
-  (pad "3" smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 28766016-5b51-4aa7-83db-fc50ad5208d3))
-  (pad "MP" smd roundrect (at -4.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 37c16fe5-ca38-4d4a-a3da-a6e1fe63b0dd))
-  (pad "MP" smd roundrect (at 4.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 93bcb2ef-dc6c-4787-a1d6-6d6d1036be68))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM03B-ZESS-TBT_1x03-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical.kicad_mod
index 9eee3d7e9..6839cf265 100644
--- a/Connector_JST.pretty/JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,60 +1,88 @@
-(footprint "JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM04B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp da2cb993-fb57-419a-b698-a541d6781fc9)
   )
-  (fp_text value "JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3a510e04-eef7-4653-94ea-1ad3f68ffb84)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -5.25 2.25) (end 5.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.36 -0.39) (end -5.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.36 2.36) (end -2.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.91 2.36) (end -2.91 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.36 -0.39) (end 5.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.36 2.36) (end 2.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.69 -3.66) (end 3.69 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.25 -3.55) (end 5.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 2.25) (end -5.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 2.25) (end 5.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.5) (end -2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0) (end -2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0) (end -2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.5) (end -2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -0.5) (end 2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 0) (end 2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 0) (end 2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -0.5) (end 2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -4.45) (end -6.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.25 4.45) (end 6.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.25 4.45) (end 6.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.25 -4.45) (end -6.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.75 2.25) (end -2.25 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 1.542893) (end -1.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 4.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c87cba86-6261-4288-a9b5-e3d6da89576f)
   )
-  (fp_line (start -5.36 2.36) (end -2.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp 087cb563-6d32-4ec8-863d-d28482f2039b))
-  (fp_line (start -5.36 -0.39) (end -5.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp 5af220de-3a71-4a3b-897b-fa3ccf9f2ec3))
-  (fp_line (start -2.91 2.36) (end -2.91 3.95) (layer "F.SilkS") (width 0.12) (tstamp 667fc927-e1b9-4259-9dab-27745b124f3e))
-  (fp_line (start 5.36 2.36) (end 2.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp 9ed98acd-c3e9-4e24-8c8e-5510992633ab))
-  (fp_line (start 5.36 -0.39) (end 5.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp c0043050-26cd-4160-b64b-509141598ced))
-  (fp_line (start -3.69 -3.66) (end 3.69 -3.66) (layer "F.SilkS") (width 0.12) (tstamp def987bb-c7db-4c2e-ac92-dbcd2e32261c))
-  (fp_line (start -6.25 -4.45) (end -6.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 5f26dae6-897c-4103-8558-2d957303dc24))
-  (fp_line (start 6.25 4.45) (end 6.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 9be921eb-61f0-4ff4-a619-d378efccfd5d))
-  (fp_line (start 6.25 -4.45) (end -6.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp a041588b-2edd-4f03-9101-96e6edacdb7a))
-  (fp_line (start -6.25 4.45) (end 6.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp dd5e20c7-0a51-41bf-b93d-28140df60a93))
-  (fp_line (start 2 -0.5) (end 2 0) (layer "F.Fab") (width 0.1) (tstamp 0b124943-4efe-49ae-a6f3-0b8dacfec2ac))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp 10d5c69b-fcb6-4624-b713-68ade5074878))
-  (fp_line (start -2.25 1.542893) (end -1.75 2.25) (layer "F.Fab") (width 0.1) (tstamp 1500a52d-18f9-4030-ba71-7ab356668791))
-  (fp_line (start -2.5 -0.5) (end -2.5 0) (layer "F.Fab") (width 0.1) (tstamp 1808d9eb-76d3-4036-af09-333efc34eb34))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1c0ea55f-b881-42f6-a9d3-d92d536a86d0))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 3ac8eb64-9523-42ec-bcbf-dfe5b38276b0))
-  (fp_line (start 2.5 0) (end 2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 56b94203-8ee3-4e28-a964-bbc38cb90de4))
-  (fp_line (start 2 0) (end 2.5 0) (layer "F.Fab") (width 0.1) (tstamp 5897917f-2523-4d59-b09a-8e96660ee0d5))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 6d0d72b6-f7dc-4df4-b254-e2dccf89c587))
-  (fp_line (start 2.5 -0.5) (end 2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 79f64c18-aa49-4bd9-ae00-ce2377a28801))
-  (fp_line (start -2.75 2.25) (end -2.25 1.542893) (layer "F.Fab") (width 0.1) (tstamp 7c6286e8-0da4-4a8c-bb0e-fe4f03bdca2e))
-  (fp_line (start -5.25 -3.55) (end 5.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp 8171a92f-a2a4-46df-9e16-3c449649cc5b))
-  (fp_line (start -2 -0.5) (end -2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9be304de-c427-4587-9438-2310c65b81ca))
-  (fp_line (start -2.5 0) (end -2 0) (layer "F.Fab") (width 0.1) (tstamp a052916f-a0c6-41ff-9c69-adfb1cc2843b))
-  (fp_line (start -2 0) (end -2 -0.5) (layer "F.Fab") (width 0.1) (tstamp b3c8c703-0e93-4b9c-81f1-b32c6c81d2bd))
-  (fp_line (start -5.25 2.25) (end 5.25 2.25) (layer "F.Fab") (width 0.1) (tstamp c83554a7-7f7d-4f8b-b6c1-d50d6e87da72))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp c84c0158-1253-4d1c-a2d1-22ffece2c5a7))
-  (fp_line (start 5.25 2.25) (end 5.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp d27af555-aa71-40d9-ae77-ad9601b14e22))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp d29f0901-374d-42dd-8818-183dd279e9df))
-  (fp_line (start -5.25 2.25) (end -5.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp f2547b48-a4a2-4637-9daa-3c327b352f01))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp f797bf78-e2c3-450c-9e8a-853108b918cd))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp fdb095e8-6441-4f65-9c85-56fbe8a712c3))
-  (pad "1" smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ec0e760a-f57c-40f7-8540-9e596ece4510))
-  (pad "2" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 74b2c76d-2737-4bd4-b0a6-7b4ef89b96c9))
-  (pad "3" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8a6f811b-f9e4-4392-996d-1121eec61ed3))
-  (pad "4" smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e6c5485f-93a3-4c8b-a452-41fe26afa9ff))
-  (pad "MP" smd roundrect (at -4.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 5c8f6230-2134-4d68-ab24-4961a05ffec0))
-  (pad "MP" smd roundrect (at 4.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp ac10c211-5718-426d-8056-69cd51ef90fd))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM04B-ZESS-TBT_1x04-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical.kicad_mod
index b7ab6f730..d4400063b 100644
--- a/Connector_JST.pretty/JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,65 +1,97 @@
-(footprint "JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM05B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b2d9dd5b-787d-49c7-b9b7-f134421457d0)
   )
-  (fp_text value "JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 14b714e4-9837-478b-a69a-f9f641b4be7d)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -6 2.25) (end 6 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.11 -0.39) (end -6.11 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 2.36) (end -3.66 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.66 2.36) (end -3.66 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 -0.39) (end 6.11 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 2.36) (end 3.66 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.44 -3.66) (end 4.44 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6 -3.55) (end 6 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 2.25) (end -6 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 2.25) (end 6 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -0.5) (end -3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 0) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -0.5) (end -1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 0) (end -1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 0) (end -1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.5) (end -1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -0.5) (end 1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 0) (end 1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 0) (end 1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -0.5) (end 1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 0) (end 3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -0.5) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -4.45) (end -7 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7 4.45) (end 7 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7 4.45) (end 7 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7 -4.45) (end -7 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 2.25) (end -3 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 1.542893) (end -2.5 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.6 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 5.6 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5e9ce54b-d5c0-4ba0-9436-2a0020a9aeaf)
   )
-  (fp_line (start 6.11 -0.39) (end 6.11 2.36) (layer "F.SilkS") (width 0.12) (tstamp 0cca8ad8-e919-44ca-a8f2-5cf1a002dce4))
-  (fp_line (start 6.11 2.36) (end 3.66 2.36) (layer "F.SilkS") (width 0.12) (tstamp 25047b48-f555-42cb-8cba-7f18279f7f68))
-  (fp_line (start -6.11 2.36) (end -3.66 2.36) (layer "F.SilkS") (width 0.12) (tstamp 58f495fc-2536-4c5a-8501-d8336d953266))
-  (fp_line (start -6.11 -0.39) (end -6.11 2.36) (layer "F.SilkS") (width 0.12) (tstamp 87712f0e-ad2f-449b-839f-932ca9fd04c8))
-  (fp_line (start -4.44 -3.66) (end 4.44 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 8d88353a-8c2c-4acc-aea4-5f00cd55dc55))
-  (fp_line (start -3.66 2.36) (end -3.66 3.95) (layer "F.SilkS") (width 0.12) (tstamp bda48ed8-ad87-4b37-9242-960ae5afc4bf))
-  (fp_line (start 7 -4.45) (end -7 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 423ee5e7-a412-45c6-b0b7-733713c3526a))
-  (fp_line (start -7 4.45) (end 7 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 6df3d9b8-08b2-479f-9a5d-d392309460bb))
-  (fp_line (start 7 4.45) (end 7 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp a8bc595a-1c59-4d84-acdd-e5e602824927))
-  (fp_line (start -7 -4.45) (end -7 4.45) (layer "F.CrtYd") (width 0.05) (tstamp b66c67ac-460a-4f8e-ba36-9697ff5b4c53))
-  (fp_line (start 6 2.25) (end 6 -3.55) (layer "F.Fab") (width 0.1) (tstamp 2d16c876-258d-4995-a345-cb1e568a072f))
-  (fp_line (start 2.75 0) (end 3.25 0) (layer "F.Fab") (width 0.1) (tstamp 311e1c7a-0cf1-4ec0-b3ec-898466fc9bb0))
-  (fp_line (start 1.75 -0.5) (end 1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 43099388-422e-4cd4-b90e-5786f8f03d55))
-  (fp_line (start 1.25 -0.5) (end 1.25 0) (layer "F.Fab") (width 0.1) (tstamp 4a78da5b-5c9f-4a52-abb0-b196f7b7a301))
-  (fp_line (start -2.75 0) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 63d7ec8b-746a-45bf-b910-767650de01b5))
-  (fp_line (start -6 2.25) (end -6 -3.55) (layer "F.Fab") (width 0.1) (tstamp 7272e25b-9119-4822-b7b6-5c7e40fc8791))
-  (fp_line (start -2.75 -0.5) (end -3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 739c81ba-312c-4ac4-8764-ffe16904e442))
-  (fp_line (start 1.75 0) (end 1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7adfdaa2-ec28-4aec-9798-035ff6e1b31e))
-  (fp_line (start 1.25 0) (end 1.75 0) (layer "F.Fab") (width 0.1) (tstamp 85a32727-3c48-4249-8993-a871e6233d75))
-  (fp_line (start -3 1.542893) (end -2.5 2.25) (layer "F.Fab") (width 0.1) (tstamp 9d5c4999-9d77-42f2-a49f-84bdfd08c9dd))
-  (fp_line (start -1.25 -0.5) (end -1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp a71207b7-3e95-4fb7-95ee-652211e0b4fa))
-  (fp_line (start -3.25 0) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp afd0cbea-0945-48fe-8829-46cf215166bc))
-  (fp_line (start -1.75 0) (end -1.25 0) (layer "F.Fab") (width 0.1) (tstamp b01fa6b9-df00-4e04-af24-0a4139576c86))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp b0a11f96-2a87-4d8b-a654-93771e3e663e))
-  (fp_line (start -1.75 -0.5) (end -1.75 0) (layer "F.Fab") (width 0.1) (tstamp bacc02ec-7b70-4fc5-8949-d4d9ef0446d4))
-  (fp_line (start 2.75 -0.5) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp bfefbdbd-618a-4217-afa4-4a8caf66e44d))
-  (fp_line (start -6 2.25) (end 6 2.25) (layer "F.Fab") (width 0.1) (tstamp c942532d-6ee1-4b0f-8ee4-6ec91acba14a))
-  (fp_line (start -3.25 -0.5) (end -3.25 0) (layer "F.Fab") (width 0.1) (tstamp cbee8437-aa47-4c1f-8d74-bed2afab547b))
-  (fp_line (start -3.5 2.25) (end -3 1.542893) (layer "F.Fab") (width 0.1) (tstamp ce8bef5f-fab6-433e-8336-02c8a046334a))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp d481e156-01d1-4db0-b752-4213a125dcf5))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp d5799466-d421-4d24-8d7b-fa6dd1938e37))
-  (fp_line (start 3.25 -0.5) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp d6cb6a24-174d-40ca-af2c-de3f0fc0def6))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp dd1c59bb-38ff-4433-8c5b-08932feb1915))
-  (fp_line (start -6 -3.55) (end 6 -3.55) (layer "F.Fab") (width 0.1) (tstamp e0d63d30-01a1-46ed-990b-923a1bb67ab4))
-  (fp_line (start -1.25 0) (end -1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp e6bd2853-3ed5-460c-b2ec-87ea19b7c8f7))
-  (fp_line (start 3.25 0) (end 3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp fb00d469-2ab9-4991-8233-48331033b55b))
-  (pad "1" smd roundrect (at -3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aacdbce5-2722-4567-a72e-1498b87160c4))
-  (pad "2" smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 05b55d01-becb-4f72-8d79-670988664c3a))
-  (pad "3" smd roundrect (at 0 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d788012a-cabe-4ecd-b6a0-60eb5bbd2d35))
-  (pad "4" smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e2bc8ea-0db7-4608-9be9-4d7f7404272d))
-  (pad "5" smd roundrect (at 3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e44821aa-d79a-4cc5-ab31-6e98fd5ebf82))
-  (pad "MP" smd roundrect (at -5.6 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 8cf759e1-fa2f-49f8-9958-5172e5cc449d))
-  (pad "MP" smd roundrect (at 5.6 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp fd2399de-5cc9-4520-9a10-2d17ecfae6c9))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM05B-ZESS-TBT_1x05-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical.kicad_mod
index 0ceecd14e..eac81d655 100644
--- a/Connector_JST.pretty/JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,70 +1,106 @@
-(footprint "JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM06B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 29996070-e762-49e5-9e46-beb41ce638f7)
   )
-  (fp_text value "JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 27cdb594-9c74-44a5-bb2b-fa361ac73d75)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -6.75 2.25) (end 6.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.86 -0.39) (end -6.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.86 2.36) (end -4.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.41 2.36) (end -4.41 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.86 -0.39) (end 6.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.86 2.36) (end 4.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.19 -3.66) (end 5.19 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.75 -3.55) (end 6.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 2.25) (end -6.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 2.25) (end 6.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.5) (end -2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0) (end -2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0) (end -2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.5) (end -2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -0.5) (end 2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 0) (end 2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 0) (end 2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -0.5) (end 2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -4.45) (end -7.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.75 4.45) (end 7.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.75 4.45) (end 7.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.75 -4.45) (end -7.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.25 2.25) (end -3.75 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 1.542893) (end -3.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 6.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4e301c77-0659-4d7f-8049-7475a0305c72)
   )
-  (fp_line (start -5.19 -3.66) (end 5.19 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 06ccb47c-0a89-4f7f-843a-202c12db419e))
-  (fp_line (start 6.86 -0.39) (end 6.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp 1d002d42-3247-436b-bad7-be467dd9c3eb))
-  (fp_line (start -6.86 -0.39) (end -6.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp 54ea0565-6e04-45ff-ae68-e588e6688ca6))
-  (fp_line (start -4.41 2.36) (end -4.41 3.95) (layer "F.SilkS") (width 0.12) (tstamp 96bde82e-9f3a-4dd1-9076-fc87cae7113b))
-  (fp_line (start 6.86 2.36) (end 4.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp a8c22c1d-633c-4b88-b36c-4ada4226dd1e))
-  (fp_line (start -6.86 2.36) (end -4.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp febcb445-0520-41b1-8897-8e9565d013f5))
-  (fp_line (start -7.75 -4.45) (end -7.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 1c9f6a74-4a5c-40d4-8193-663ec00477c3))
-  (fp_line (start 7.75 4.45) (end 7.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 23dc2a52-0ab0-43b6-bb42-fb5bc4470f2a))
-  (fp_line (start -7.75 4.45) (end 7.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp c2edd6b5-527b-47f4-a1f3-a74202ff6485))
-  (fp_line (start 7.75 -4.45) (end -7.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp d39d86e5-d92a-4812-b46e-08d0b1b7edb5))
-  (fp_line (start -2 0) (end -2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 06991fac-d8da-4eb3-88c7-6a1dc00b1f87))
-  (fp_line (start 6.75 2.25) (end 6.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 0dffcf43-caab-411f-976a-de579f0e1d4f))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0eecc5a1-ca0d-4999-8071-b809bfacd85c))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp 0fa73910-5a79-4e83-97cf-9b6a4e219c90))
-  (fp_line (start -4.25 2.25) (end -3.75 1.542893) (layer "F.Fab") (width 0.1) (tstamp 15e3e925-dfa8-45a7-8c38-acf738c27e5c))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 16d224fa-4132-4417-8b1a-b6460b0ea353))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 277e00a7-99c8-4ed2-a7fe-518352b24e75))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp 2af66793-bef3-4eb8-8504-1ab998ad25a9))
-  (fp_line (start -2.5 -0.5) (end -2.5 0) (layer "F.Fab") (width 0.1) (tstamp 2deee0f8-c8ed-471a-aefd-6ae7f0267548))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 30b566b2-53d9-4b9f-90c0-e398fdc0b56e))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp 32d8a901-c4ee-4327-b625-303991c6e424))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3acbc8f0-be1e-4317-ad77-e56ec2553d21))
-  (fp_line (start -2.5 0) (end -2 0) (layer "F.Fab") (width 0.1) (tstamp 46eb28d0-d322-45c5-89c4-776cfd4b7e52))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 48fffa06-c4ea-42b2-bd3b-503fddd02d16))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 50b4c81d-cc8c-4eef-a714-a9302d525cdf))
-  (fp_line (start -6.75 2.25) (end -6.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 51f57447-2a96-4c58-b796-c058eea7ef1c))
-  (fp_line (start -6.75 2.25) (end 6.75 2.25) (layer "F.Fab") (width 0.1) (tstamp 55cf21d7-df52-4ea0-9313-f62eb5df8318))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7175572d-54a2-4b61-9bb0-caa5589c9920))
-  (fp_line (start -6.75 -3.55) (end 6.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 8dcdeeee-7a21-415c-9b99-e7d9b9cbdb65))
-  (fp_line (start 2.5 -0.5) (end 2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8ed5eb5b-ac43-4c24-9004-6ee9be5eee39))
-  (fp_line (start 2.5 0) (end 2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 934e3c32-f208-4959-bdd7-b051d932dbe8))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 961b7201-63bd-42dc-93c7-5067f1567241))
-  (fp_line (start 2 0) (end 2.5 0) (layer "F.Fab") (width 0.1) (tstamp 9791861d-ad8d-4a72-9719-24ad038fd87e))
-  (fp_line (start 2 -0.5) (end 2 0) (layer "F.Fab") (width 0.1) (tstamp 9ecce3bc-d06b-497b-bcf5-0ce625baca3e))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b2bef1ed-2a7b-4553-bf6c-ceb8e11fc1c5))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b4930d9d-85b4-4b68-bfb0-ba96fa7a4cab))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp bb674bda-0ede-4e36-bb9d-e9c7458ccd77))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp bc029c90-324f-4454-b21e-98fc1a3cac5e))
-  (fp_line (start -2 -0.5) (end -2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp cf8fa303-c078-446f-b1b3-d864b77935dd))
-  (fp_line (start -3.75 1.542893) (end -3.25 2.25) (layer "F.Fab") (width 0.1) (tstamp efe6fc26-83ab-4cd5-bca7-9b38538459c7))
-  (pad "1" smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c91b97fb-9c0f-4fc4-88b7-5a34dc150a30))
-  (pad "2" smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 241c8adf-ed1f-487f-92e4-29a7d99237da))
-  (pad "3" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6ea259bb-f5a0-455c-91ba-53a303b36ea4))
-  (pad "4" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0ce23768-0069-4894-a043-5f5d62cce328))
-  (pad "5" smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 01e82328-622b-4624-898c-78395e2a1e64))
-  (pad "6" smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 64cde087-2f72-48a1-ab05-8505a848aefb))
-  (pad "MP" smd roundrect (at -6.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 5705df65-f3fb-43d9-bfcc-b19d88402922))
-  (pad "MP" smd roundrect (at 6.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 7b1132bc-1899-4ef5-8f22-f6f1d1ed8a6f))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM06B-ZESS-TBT_1x06-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical.kicad_mod
index 0e89d3d8f..19ecd476d 100644
--- a/Connector_JST.pretty/JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,75 +1,115 @@
-(footprint "JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM07B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d0b0d268-b3cd-4fea-870f-22ceb98a02b0)
   )
-  (fp_text value "JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5f445a0b-2d90-43c6-969f-19daa2aa95e9)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -7.5 2.25) (end 7.5 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.61 -0.39) (end -7.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 2.36) (end -5.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.16 2.36) (end -5.16 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 -0.39) (end 7.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 2.36) (end 5.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.94 -3.66) (end 5.94 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.5 -3.55) (end 7.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 2.25) (end -7.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.5 2.25) (end 7.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 0) (end -4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -0.5) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -0.5) (end -3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 0) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -0.5) (end -1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 0) (end -1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 0) (end -1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.5) (end -1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -0.5) (end 1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 0) (end 1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 0) (end 1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -0.5) (end 1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 0) (end 3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -0.5) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -0.5) (end 4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 0) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -4.45) (end -8.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.5 4.45) (end 8.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.5 4.45) (end 8.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.5 -4.45) (end -8.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5 2.25) (end -4.5 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 1.542893) (end -4 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 7.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a2f03883-887d-4b48-b17c-0e8a75888150)
   )
-  (fp_line (start -7.61 -0.39) (end -7.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp 0096e69b-eb01-4168-9c19-d9b665ff2845))
-  (fp_line (start -5.94 -3.66) (end 5.94 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 36f38f88-9b25-4742-a9f2-0007d52354b0))
-  (fp_line (start 7.61 2.36) (end 5.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp 6ff63ce9-bd7b-4f5e-a6b4-d34d296aa718))
-  (fp_line (start -7.61 2.36) (end -5.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp 896094cd-b2bf-4947-bfa9-94688e01bf7f))
-  (fp_line (start -5.16 2.36) (end -5.16 3.95) (layer "F.SilkS") (width 0.12) (tstamp 899e5b93-888a-4d0c-8b69-bc3c22ccf7dd))
-  (fp_line (start 7.61 -0.39) (end 7.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp a9dd1acd-6804-4cd5-8262-216de5a3915a))
-  (fp_line (start 8.5 4.45) (end 8.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 390c619e-ed20-4c4e-bc6b-5d614babd40b))
-  (fp_line (start -8.5 -4.45) (end -8.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 5bec4485-7230-4b6a-bb52-d1f1bd6fccd6))
-  (fp_line (start 8.5 -4.45) (end -8.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp a52145e9-0cdb-4586-8997-b50cb62a5bcf))
-  (fp_line (start -8.5 4.45) (end 8.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp bb28a000-8812-43ed-bd76-12fa75eeee7c))
-  (fp_line (start -2.75 -0.5) (end -3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0ac1db17-4bab-4b06-847c-ee52f24ac7bd))
-  (fp_line (start 7.5 2.25) (end 7.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp 0e9da0e8-a646-4df1-be8d-a187c33fa663))
-  (fp_line (start -4.75 -0.5) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp 1283f784-942e-4462-bf1f-cf11d73fe1f3))
-  (fp_line (start -1.75 -0.5) (end -1.75 0) (layer "F.Fab") (width 0.1) (tstamp 15f13056-dbfd-4335-bdaa-e0b587b18bc2))
-  (fp_line (start -3.25 -0.5) (end -3.25 0) (layer "F.Fab") (width 0.1) (tstamp 1e90b0b4-aa05-4c93-bda3-4bfc5958379e))
-  (fp_line (start 2.75 0) (end 3.25 0) (layer "F.Fab") (width 0.1) (tstamp 3209868f-deef-496e-980e-3324432d87e6))
-  (fp_line (start 1.75 0) (end 1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 366b7e5c-098c-4c97-8509-f43cfeeaef57))
-  (fp_line (start -2.75 0) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3c0f39cf-8d5f-496c-b600-375c01523ecb))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 3fe8f1c0-41bb-46c8-988c-beb45eb1a062))
-  (fp_line (start -7.5 -3.55) (end 7.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp 46be0667-b26c-4317-974c-d21fde4e2f29))
-  (fp_line (start 1.25 -0.5) (end 1.25 0) (layer "F.Fab") (width 0.1) (tstamp 47bd2afb-0064-4efb-9d27-88a6ff745278))
-  (fp_line (start 3.25 -0.5) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5686c77a-11a5-401d-9175-5633670118d9))
-  (fp_line (start 2.75 -0.5) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 5d62763d-a264-4d9e-8bb7-8c3304221e04))
-  (fp_line (start 4.25 -0.5) (end 4.25 0) (layer "F.Fab") (width 0.1) (tstamp 5d7ce4e7-23e1-41df-b13c-388c7ea09440))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp 66863bdf-df5f-4a69-ba37-291d673944c5))
-  (fp_line (start 4.75 0) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 679485bf-5b71-4f56-91a3-33f42f743ef2))
-  (fp_line (start 1.75 -0.5) (end 1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6a2f3c77-a5d1-41e8-977b-daa2baef42f6))
-  (fp_line (start -1.75 0) (end -1.25 0) (layer "F.Fab") (width 0.1) (tstamp 79d39f70-7ead-4989-a59c-11ed491acbe8))
-  (fp_line (start -7.5 2.25) (end -7.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp 7fa7c01d-01ea-4f3a-8a1f-d08dde3a277f))
-  (fp_line (start -1.25 -0.5) (end -1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 85bac028-9f93-433b-9c8f-f36e4fb3bfd2))
-  (fp_line (start 4.75 -0.5) (end 4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 86c93bfc-d1a7-4daf-87bf-b9b5d60c67ac))
-  (fp_line (start -4.25 0) (end -4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 92fac188-ecab-4ca1-adab-44e2b09f7576))
-  (fp_line (start 1.25 0) (end 1.75 0) (layer "F.Fab") (width 0.1) (tstamp a927bc98-a264-4cf7-96cf-93bb8085f073))
-  (fp_line (start 4.25 0) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp ab6fbf49-23b0-42fa-a78c-46ba72699c27))
-  (fp_line (start -4.25 -0.5) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp b3df70a8-518a-4a34-9a69-020f6a056873))
-  (fp_line (start -4.75 0) (end -4.25 0) (layer "F.Fab") (width 0.1) (tstamp b437bf65-6e6e-4e40-86ff-e30d84b06638))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp cb4c2c11-df87-4cf8-ac0d-44af4763cf3f))
-  (fp_line (start 3.25 0) (end 3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp cf9ac717-c103-462d-a665-d4276b7ba9eb))
-  (fp_line (start -3.25 0) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp d9a1e988-700a-4b0b-9a68-e71335a10356))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp e4c56a80-b321-4abf-9716-addcb0624a25))
-  (fp_line (start -1.25 0) (end -1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp f140fb72-06aa-4c18-874b-d1a4d40943ee))
-  (fp_line (start -4.5 1.542893) (end -4 2.25) (layer "F.Fab") (width 0.1) (tstamp fc40b6e4-275d-47cb-8234-ea7f6e96de1b))
-  (fp_line (start -7.5 2.25) (end 7.5 2.25) (layer "F.Fab") (width 0.1) (tstamp fea7b669-ee60-45cc-89a6-80083f2706b4))
-  (fp_line (start -5 2.25) (end -4.5 1.542893) (layer "F.Fab") (width 0.1) (tstamp feb00391-da2b-4c3d-a008-a8df15974a5a))
-  (pad "1" smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c87b4e72-5ffa-4794-9089-bc85ed0a424b))
-  (pad "2" smd roundrect (at -3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eeee95ac-9436-4e06-a2ac-9a1d7aca57c6))
-  (pad "3" smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e8aff08b-dae8-4585-bc8c-921fe8a7dc13))
-  (pad "4" smd roundrect (at 0 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c0c148aa-5c6c-4dca-be84-9194d81a8e43))
-  (pad "5" smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 32feb7f5-e6d6-4447-88c3-b4d81eb228a9))
-  (pad "6" smd roundrect (at 3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 74985b0c-68f4-4c19-9f2e-f6c27e359a0f))
-  (pad "7" smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9c9f5db2-867c-4afd-862a-86e6edb5a89c))
-  (pad "MP" smd roundrect (at 7.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 24c1253d-8776-4b64-859a-0e84b2101c26))
-  (pad "MP" smd roundrect (at -7.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 6a68131a-efd0-4d58-8538-30aa5e1fa88b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM07B-ZESS-TBT_1x07-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical.kicad_mod
index bb83701ef..6a21cc3aa 100644
--- a/Connector_JST.pretty/JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,80 +1,124 @@
-(footprint "JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM08B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 80a06779-bca4-4525-81bb-7838a37b7e9b)
   )
-  (fp_text value "JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 46873513-7aa5-4a62-9a85-920373c91378)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -8.25 2.25) (end 8.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.36 -0.39) (end -8.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.36 2.36) (end -5.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.91 2.36) (end -5.91 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.36 -0.39) (end 8.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.36 2.36) (end 5.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.69 -3.66) (end 6.69 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.25 -3.55) (end 8.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 2.25) (end -8.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 2.25) (end 8.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -0.5) (end -5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 0) (end -5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 0) (end -5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.5) (end -5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.5) (end -2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0) (end -2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0) (end -2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.5) (end -2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -0.5) (end 2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 0) (end 2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 0) (end 2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -0.5) (end 2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 -0.5) (end 5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 0) (end 5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 0) (end 5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 -0.5) (end 5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -4.45) (end -9.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.25 4.45) (end 9.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.25 4.45) (end 9.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.25 -4.45) (end -9.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.75 2.25) (end -5.25 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 1.542893) (end -4.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 7.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 40011b1b-5ac0-4623-ac8b-4e45b4b15c0c)
   )
-  (fp_line (start -5.91 2.36) (end -5.91 3.95) (layer "F.SilkS") (width 0.12) (tstamp 05915c26-5d74-49b9-9abf-11ef0f70cdf5))
-  (fp_line (start -8.36 2.36) (end -5.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp 2b846eb5-d967-4e86-98cf-7f5c1310b410))
-  (fp_line (start -8.36 -0.39) (end -8.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp 63381952-3bfd-4064-bd20-04f34f14d44e))
-  (fp_line (start -6.69 -3.66) (end 6.69 -3.66) (layer "F.SilkS") (width 0.12) (tstamp a284ce95-3284-4986-b800-e282ea4a6e94))
-  (fp_line (start 8.36 -0.39) (end 8.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp b35ec197-c046-4cdc-93fd-bb391768eae5))
-  (fp_line (start 8.36 2.36) (end 5.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp e012c7a8-aa63-4024-aad2-b32635e5d46c))
-  (fp_line (start 9.25 -4.45) (end -9.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 4f7a9da8-28ec-4f42-b7a3-932498b6b64b))
-  (fp_line (start -9.25 -4.45) (end -9.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 75490e99-495f-44de-8da8-3d27322d17f0))
-  (fp_line (start 9.25 4.45) (end 9.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 82afc0b6-5d20-4ecb-aa2b-039802e13083))
-  (fp_line (start -9.25 4.45) (end 9.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 93eec0cb-c003-4898-b2c6-3726fc673425))
-  (fp_line (start -2 -0.5) (end -2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0d419884-ca32-4fd5-81c9-a2defe92adfe))
-  (fp_line (start -2 0) (end -2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0d7cd33c-dc39-4cbe-8985-78f2aab7ff57))
-  (fp_line (start -5 0) (end -5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3070984d-caef-4314-a1cc-4092e57aea85))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 38e3c075-c66f-41a3-9579-f293c20f4508))
-  (fp_line (start -8.25 2.25) (end -8.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp 3acce1aa-56a0-470a-8d5b-9da572d0742e))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp 3bee7a58-e5ee-4fc2-83f9-bb4acef753a0))
-  (fp_line (start 8.25 2.25) (end 8.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp 3cbe140b-0224-42dd-9a14-e30f4aec24b4))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 3d49c58a-923f-4c13-bf3b-2a27ba3b0bf2))
-  (fp_line (start 5.5 -0.5) (end 5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3dc871c8-1c64-4861-8526-c6096e237b07))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 3fe58aea-7558-47c9-b5d1-02ac65286356))
-  (fp_line (start -2.5 0) (end -2 0) (layer "F.Fab") (width 0.1) (tstamp 41a9ada4-fac5-4f55-8369-de168f4709a8))
-  (fp_line (start -2.5 -0.5) (end -2.5 0) (layer "F.Fab") (width 0.1) (tstamp 4263cb43-eb17-4a44-8144-3577902e9d1f))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 449b871e-72a7-46d5-8d58-6fd743ea3199))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4c40ba75-36c5-46df-90ea-ff3869c2fda2))
-  (fp_line (start -5.5 0) (end -5 0) (layer "F.Fab") (width 0.1) (tstamp 53f5f5e3-a473-4947-b0fe-57f278f0d7b2))
-  (fp_line (start 5.5 0) (end 5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 58acafd7-6e1d-4e59-b51d-39d9552d8b19))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 786170c1-d991-42cc-a444-a440f78bdce7))
-  (fp_line (start 2.5 0) (end 2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8ae4dc9b-1d05-487c-81df-0b6cadd5420a))
-  (fp_line (start 5 -0.5) (end 5 0) (layer "F.Fab") (width 0.1) (tstamp 8f8c91bb-9d9a-4e0a-a94c-fad6826ea485))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9507d59a-afaa-4ca0-acc0-b13aa5f325df))
-  (fp_line (start 5 0) (end 5.5 0) (layer "F.Fab") (width 0.1) (tstamp 963ca18c-b335-4a3d-a739-33a4cccca43d))
-  (fp_line (start -8.25 -3.55) (end 8.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp 96a3abb8-5343-436e-9745-cb2be9015e39))
-  (fp_line (start 2.5 -0.5) (end 2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 99e9d146-fef4-4404-8e6a-ef936da3caf8))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9ce7a6d5-5207-411a-ae0d-2f7c1c33b104))
-  (fp_line (start -5.5 -0.5) (end -5.5 0) (layer "F.Fab") (width 0.1) (tstamp 9e82396d-9012-4962-b9c5-1fca42c6e5aa))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp ab29448f-21a9-4525-ad8b-11f709ad53db))
-  (fp_line (start 2 -0.5) (end 2 0) (layer "F.Fab") (width 0.1) (tstamp af936f57-3024-406f-b553-54c3db2e4e29))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp b1918d49-9711-409e-8817-edb5f2eccc92))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b4a18095-08b3-4e9c-a570-050c8cf5d9c0))
-  (fp_line (start -8.25 2.25) (end 8.25 2.25) (layer "F.Fab") (width 0.1) (tstamp c5c919e8-2cc1-4e34-8866-903c8318fece))
-  (fp_line (start -5 -0.5) (end -5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp cbaa5321-ce4f-4956-a8b0-aa782745abe8))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp d2e12936-925a-4c7c-a6a5-b6315527e892))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp d7a73a16-6c11-4332-9db8-5a0178432e9a))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp da7e53fe-3508-4641-982f-af2be239d888))
-  (fp_line (start -5.25 1.542893) (end -4.75 2.25) (layer "F.Fab") (width 0.1) (tstamp dab60e51-166e-4ab4-b0ca-5eca957d374c))
-  (fp_line (start -5.75 2.25) (end -5.25 1.542893) (layer "F.Fab") (width 0.1) (tstamp dc8b02d6-6d52-418b-90e0-e210f5e1ad0f))
-  (fp_line (start 2 0) (end 2.5 0) (layer "F.Fab") (width 0.1) (tstamp ed018144-70ac-41c8-8bdc-d7f808f097cf))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp f64a2c71-d23e-4626-9ab4-ff32540a7c10))
-  (pad "1" smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a38c8db0-292d-483a-a418-8390bc0a5ee5))
-  (pad "2" smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cdf4ced4-b714-4035-b3fd-2c559b3e816f))
-  (pad "3" smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc6cd402-79ed-4e57-9bb1-da4c2e11560e))
-  (pad "4" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dbd869f9-cefd-4cf1-b878-bdacb688ddb4))
-  (pad "5" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 189aedfb-7da4-4462-8f1c-fd5599f5de51))
-  (pad "6" smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f45d6771-9bf2-4bb8-bf7e-6d026b0f663f))
-  (pad "7" smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6cba9302-fbc0-41f2-91b5-3067fd3488a3))
-  (pad "8" smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fcbaf92e-3563-4bed-a02e-8defa5ba2ca6))
-  (pad "MP" smd roundrect (at -7.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 81782436-755c-44a2-8805-2b19dab33858))
-  (pad "MP" smd roundrect (at 7.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp f51698db-b954-4e58-8ff2-33a0b54681b4))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM08B-ZESS-TBT_1x08-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical.kicad_mod
index 5bfb2d195..5123f737a 100644
--- a/Connector_JST.pretty/JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,85 +1,133 @@
-(footprint "JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM09B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp dd6bc73b-b44c-48a3-a052-c11ee4d31389)
   )
-  (fp_text value "JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ed94160c-c7b6-41f5-bb88-951c822f10bd)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -9 2.25) (end 9 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.11 -0.39) (end -9.11 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.11 2.36) (end -6.66 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.66 2.36) (end -6.66 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.11 -0.39) (end 9.11 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.11 2.36) (end 6.66 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.44 -3.66) (end 7.44 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9 -3.55) (end 9 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 2.25) (end -9 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9 2.25) (end 9 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -0.5) (end -6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 0) (end -5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 0) (end -5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -0.5) (end -6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 0) (end -4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -0.5) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -0.5) (end -3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 0) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -0.5) (end -1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 0) (end -1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 0) (end -1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.5) (end -1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -0.5) (end 1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 0) (end 1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 0) (end 1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -0.5) (end 1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 0) (end 3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -0.5) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -0.5) (end 4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 0) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -0.5) (end 5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 0) (end 6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 0) (end 6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -0.5) (end 5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 -4.45) (end -10 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10 4.45) (end 10 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 4.45) (end 10 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 -4.45) (end -10 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 2.25) (end -6 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 1.542893) (end -5.5 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.6 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 8.6 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp af764d36-22ec-4aee-b346-9a39654c42d3)
   )
-  (fp_line (start -6.66 2.36) (end -6.66 3.95) (layer "F.SilkS") (width 0.12) (tstamp 29f667b2-264b-43ce-aa50-eb7bf253f469))
-  (fp_line (start -7.44 -3.66) (end 7.44 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 489e5578-d040-40f5-957c-7f29819c2744))
-  (fp_line (start -9.11 2.36) (end -6.66 2.36) (layer "F.SilkS") (width 0.12) (tstamp 6e232ec3-abfb-4688-ab4f-ff34ad209b33))
-  (fp_line (start -9.11 -0.39) (end -9.11 2.36) (layer "F.SilkS") (width 0.12) (tstamp 97e018ef-1dce-41b6-a503-ad24a0452f3e))
-  (fp_line (start 9.11 -0.39) (end 9.11 2.36) (layer "F.SilkS") (width 0.12) (tstamp c6e76e83-2068-44ec-b82b-a02ba687cdeb))
-  (fp_line (start 9.11 2.36) (end 6.66 2.36) (layer "F.SilkS") (width 0.12) (tstamp e6230552-d931-4793-8aba-2e73fea06e91))
-  (fp_line (start -10 4.45) (end 10 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 1340a5c2-d808-425c-b80e-d2728fbc2b02))
-  (fp_line (start -10 -4.45) (end -10 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 90e7c17f-66ef-4b19-b9f6-97f586d6590a))
-  (fp_line (start 10 4.45) (end 10 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 98eacc62-5c51-4637-a818-469ea0031877))
-  (fp_line (start 10 -4.45) (end -10 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp e23ee8a5-04ba-4fdb-800c-6ea60d07270d))
-  (fp_line (start 1.75 0) (end 1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 025d9bb5-792b-4d76-8dd7-a634ecad8810))
-  (fp_line (start 2.75 0) (end 3.25 0) (layer "F.Fab") (width 0.1) (tstamp 059b158d-1fa0-4f18-b3ff-bf961d277678))
-  (fp_line (start 1.25 0) (end 1.75 0) (layer "F.Fab") (width 0.1) (tstamp 16aeea14-9cfa-469f-bb01-83eec35ef28b))
-  (fp_line (start 9 2.25) (end 9 -3.55) (layer "F.Fab") (width 0.1) (tstamp 191947f0-aa2b-49db-9bb0-6b43cfc19f55))
-  (fp_line (start -3.25 -0.5) (end -3.25 0) (layer "F.Fab") (width 0.1) (tstamp 24c49844-8f78-43ec-bf05-7b56aa460f58))
-  (fp_line (start -6.25 0) (end -5.75 0) (layer "F.Fab") (width 0.1) (tstamp 25b49009-50dd-4bd5-a7da-531c3fe78c8f))
-  (fp_line (start -6.25 -0.5) (end -6.25 0) (layer "F.Fab") (width 0.1) (tstamp 29b215b7-72a3-42c1-a312-42f861a56f4f))
-  (fp_line (start -6.5 2.25) (end -6 1.542893) (layer "F.Fab") (width 0.1) (tstamp 3b9a2623-b1b0-4b8f-affc-4e70f3bc209e))
-  (fp_line (start -1.75 -0.5) (end -1.75 0) (layer "F.Fab") (width 0.1) (tstamp 3d333742-612b-4ff5-801a-fa8d209d5de4))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 3e0b3d60-8a6d-46d1-aacd-3e9ad44516d2))
-  (fp_line (start -2.75 0) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3e69a8ee-c1d0-4552-b634-7c8655d3e9a9))
-  (fp_line (start -4.25 0) (end -4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 55f399cd-76ea-4b32-8f79-28f0e997c06e))
-  (fp_line (start -9 2.25) (end 9 2.25) (layer "F.Fab") (width 0.1) (tstamp 57791f67-ac64-49ac-9ff1-32639e329dab))
-  (fp_line (start 1.25 -0.5) (end 1.25 0) (layer "F.Fab") (width 0.1) (tstamp 58859f09-89a4-4bcd-a840-5c9a971de165))
-  (fp_line (start 5.75 -0.5) (end 5.75 0) (layer "F.Fab") (width 0.1) (tstamp 59818ba6-f1a1-419f-9d0b-cba4ff5829c7))
-  (fp_line (start -9 -3.55) (end 9 -3.55) (layer "F.Fab") (width 0.1) (tstamp 5a5d1ea9-7d2f-48d8-b3d4-482ed801d543))
-  (fp_line (start 5.75 0) (end 6.25 0) (layer "F.Fab") (width 0.1) (tstamp 5cc087f8-a037-4116-bfa4-990dea2c6a0a))
-  (fp_line (start -1.75 0) (end -1.25 0) (layer "F.Fab") (width 0.1) (tstamp 5e264dee-2afb-4862-b2d3-3f9bc45689c8))
-  (fp_line (start -4.75 0) (end -4.25 0) (layer "F.Fab") (width 0.1) (tstamp 64ac79ce-1036-44e4-9808-0351eeed94af))
-  (fp_line (start 4.25 -0.5) (end 4.25 0) (layer "F.Fab") (width 0.1) (tstamp 64ded2d7-b2e7-41aa-b122-be0b96de8562))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7283a9b8-03f6-4dcf-8722-ece18aa2aff1))
-  (fp_line (start 4.75 0) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 72ee44a1-db04-46f1-9978-01d266047061))
-  (fp_line (start -1.25 0) (end -1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 775de607-d594-439c-bcf4-ce8f253984d9))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 799f7fb6-354d-4d99-a19e-497385d359db))
-  (fp_line (start 6.25 0) (end 6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 88787c92-da95-4bfe-a8cc-88562f24282d))
-  (fp_line (start -3.25 0) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp 8c183114-eb0c-4fb0-acdd-3839c452b04b))
-  (fp_line (start 4.25 0) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp 93139959-ff7f-45f1-ad78-26e0ffc7a351))
-  (fp_line (start 3.25 0) (end 3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp ad00a669-9238-4cd9-949a-e61f3d451052))
-  (fp_line (start -5.75 0) (end -5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp b9c8d36c-3795-498c-89d8-efd6d2cb8ca7))
-  (fp_line (start -4.25 -0.5) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp bb778106-264e-4af8-926a-a6c4666aaa5a))
-  (fp_line (start -9 2.25) (end -9 -3.55) (layer "F.Fab") (width 0.1) (tstamp bf9667df-f241-47e1-8680-9d18e6e76b4d))
-  (fp_line (start 3.25 -0.5) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp c2e12a65-624d-4295-b0b9-45ca97af3802))
-  (fp_line (start -4.75 -0.5) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp c7ce2e61-a590-4ca8-83ab-749895c1d018))
-  (fp_line (start 6.25 -0.5) (end 5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp c85fb9c9-5639-4a59-b596-827f8cbfaa4c))
-  (fp_line (start 1.75 -0.5) (end 1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp d519be3e-f902-4fd2-98f9-2fb8750320cc))
-  (fp_line (start 2.75 -0.5) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp daacd101-0ff0-45a8-9fe6-6a51ad93b449))
-  (fp_line (start -5.75 -0.5) (end -6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp e5276570-a10b-4cf2-a0c3-fbaf8f9f57a9))
-  (fp_line (start -1.25 -0.5) (end -1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp e5c58db0-a1d6-4f65-bb89-89e8efc0bc39))
-  (fp_line (start -6 1.542893) (end -5.5 2.25) (layer "F.Fab") (width 0.1) (tstamp e83e993d-18fa-41ef-a03e-cee4e95b9f77))
-  (fp_line (start 4.75 -0.5) (end 4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp e9785fc4-daf4-4cf5-8375-6c898ee0c117))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp ea7379d7-e7e5-45e6-be15-fa8d1c14f396))
-  (fp_line (start -2.75 -0.5) (end -3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp fd2b1325-2996-4877-84c0-67be778e8c03))
-  (pad "1" smd roundrect (at -6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 77ccbdfb-4a20-459c-a465-de7f719c0383))
-  (pad "2" smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 036de789-5a2c-4824-9aff-12f69dc903e7))
-  (pad "3" smd roundrect (at -3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1c52bbb0-0075-4da5-93f6-332639c8eda4))
-  (pad "4" smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 819e769a-d17e-4dd4-ad30-3203de169d38))
-  (pad "5" smd roundrect (at 0 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b009a5df-4560-411a-abc2-968107e4d07d))
-  (pad "6" smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 39ab1760-6ca1-4341-8db0-029bdcba82f3))
-  (pad "7" smd roundrect (at 3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 41914ede-40e0-4fc1-b442-670d83163deb))
-  (pad "8" smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f846e902-9cd1-4a28-a901-695fea333726))
-  (pad "9" smd roundrect (at 6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 91b36ec7-1148-4a80-92b8-36ff0f758cc6))
-  (pad "MP" smd roundrect (at 8.6 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 7578185a-d637-4cc6-ad85-1e4976d02c6f))
-  (pad "MP" smd roundrect (at -8.6 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 8853d54e-d26c-4b96-96ae-11f43fc6a878))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM09B-ZESS-TBT_1x09-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical.kicad_mod
index 711de77c2..1472ae30b 100644
--- a/Connector_JST.pretty/JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,90 +1,142 @@
-(footprint "JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM10B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b46c87f6-ab8b-4b5f-bfd8-27850c03bcad)
   )
-  (fp_text value "JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b7b33dba-8aab-40e9-bc79-3a4b8b57eb37)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -9.75 2.25) (end 9.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.86 -0.39) (end -9.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.86 2.36) (end -7.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.41 2.36) (end -7.41 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 -0.39) (end 9.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 2.36) (end 7.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.19 -3.66) (end 8.19 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.75 -3.55) (end 9.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 2.25) (end -9.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 2.25) (end 9.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -0.5) (end -7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 0) (end -6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0) (end -6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.5) (end -7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -0.5) (end -5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 0) (end -5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 0) (end -5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.5) (end -5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.5) (end -2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0) (end -2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0) (end -2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.5) (end -2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -0.5) (end 2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 0) (end 2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 0) (end 2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -0.5) (end 2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 -0.5) (end 5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 0) (end 5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 0) (end 5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 -0.5) (end 5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -0.5) (end 6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 0) (end 7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 0) (end 7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 -0.5) (end 6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -4.45) (end -10.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.75 4.45) (end 10.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.75 4.45) (end 10.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.75 -4.45) (end -10.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.25 2.25) (end -6.75 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 1.542893) (end -6.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 9.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp fdd3a242-fe5f-4512-8e17-de1b31b0b001)
   )
-  (fp_line (start -7.41 2.36) (end -7.41 3.95) (layer "F.SilkS") (width 0.12) (tstamp 0a5e7233-a50f-4015-b5e7-d1446db3d92f))
-  (fp_line (start -9.86 2.36) (end -7.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp 31c10e03-c144-4c07-8e96-3d824a643612))
-  (fp_line (start -9.86 -0.39) (end -9.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp 5e88d68b-9e4c-49d4-9d35-8663424a3747))
-  (fp_line (start -8.19 -3.66) (end 8.19 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 8f393cd3-086f-4475-b027-e91e72081740))
-  (fp_line (start 9.86 2.36) (end 7.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp d1777bf9-cf5e-4e52-b214-69d6bf1122f3))
-  (fp_line (start 9.86 -0.39) (end 9.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp fdb22266-6466-4fdf-bb34-30371624c170))
-  (fp_line (start 10.75 -4.45) (end -10.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 29e7330b-2a80-49d7-9631-5ed4299699e6))
-  (fp_line (start -10.75 -4.45) (end -10.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 49e66798-d137-490c-ad98-1adf8b89df9f))
-  (fp_line (start 10.75 4.45) (end 10.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 5dd2d43f-4b48-4fc5-a1cb-0888c00e3be9))
-  (fp_line (start -10.75 4.45) (end 10.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp b1f2d11c-f481-4d36-959e-94cd0758ba06))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp 0a670153-0084-41b6-a7ea-258fa46ccb85))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1ab3dc9c-c682-42bb-a19e-83c9c8c1762d))
-  (fp_line (start 7 -0.5) (end 6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1cd22657-be58-4936-9f7f-aee67264c3ff))
-  (fp_line (start -5.5 0) (end -5 0) (layer "F.Fab") (width 0.1) (tstamp 1d0e55e0-9d07-4654-8d52-51c94e1d40e5))
-  (fp_line (start 7 0) (end 7 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1dc52b99-a9e8-40d2-8eca-c65a320f624f))
-  (fp_line (start -5 -0.5) (end -5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 20deb184-3999-49b0-b7cf-16bf158ddf3b))
-  (fp_line (start -5.5 -0.5) (end -5.5 0) (layer "F.Fab") (width 0.1) (tstamp 2c222232-78c1-4c04-b93d-4655848f1fde))
-  (fp_line (start 2 -0.5) (end 2 0) (layer "F.Fab") (width 0.1) (tstamp 3425675d-c526-484d-b697-e901ae7c11f7))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 41f92857-d588-4330-8cb6-8de021203c3a))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp 42adab8d-d9c8-4256-817c-b71328ada9b2))
-  (fp_line (start -7 0) (end -6.5 0) (layer "F.Fab") (width 0.1) (tstamp 46165dbb-4538-4083-bff2-c029ce991663))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 466f38e5-eb88-4f6a-a5e2-a89371fbba83))
-  (fp_line (start 5.5 -0.5) (end 5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 54c7dc94-5801-46db-8e80-970bad687b81))
-  (fp_line (start 6.5 0) (end 7 0) (layer "F.Fab") (width 0.1) (tstamp 5a0eb3cb-91c0-4fd3-949f-634022a5001e))
-  (fp_line (start -5 0) (end -5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5aeb1ef2-83ac-4ae7-9be3-ae9eeef1941a))
-  (fp_line (start 2 0) (end 2.5 0) (layer "F.Fab") (width 0.1) (tstamp 5ef361f4-11bd-4794-b859-74435c0fc0da))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp 6127f067-f6cf-478d-bbc3-2f85a78ec663))
-  (fp_line (start 9.75 2.25) (end 9.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 6294ac9d-49cb-47c0-92d8-2649302a37fb))
-  (fp_line (start -2 -0.5) (end -2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 63d7357b-60b2-40c7-a31a-95b469483dd7))
-  (fp_line (start 5.5 0) (end 5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 674fed2e-6db7-49b5-b119-f7fbddef7761))
-  (fp_line (start 2.5 0) (end 2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 67fa0ae5-6c8f-42b3-a007-96b96ff2e673))
-  (fp_line (start 2.5 -0.5) (end 2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 68b42d4e-bce4-4e43-828c-ef8d4c629fd7))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6ac88c33-ae54-4048-971c-b20a6ea4d79a))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6d56deff-dee0-4160-ab53-239ef93202e6))
-  (fp_line (start 6.5 -0.5) (end 6.5 0) (layer "F.Fab") (width 0.1) (tstamp 7036e7d8-9443-4591-80c3-013a518d1a99))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 737d86be-aa1d-4a5e-adfe-f494431ecb56))
-  (fp_line (start -2.5 -0.5) (end -2.5 0) (layer "F.Fab") (width 0.1) (tstamp 7596ca51-6884-4cc5-8939-5e7d62a7756c))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp 7ae322d9-8415-49a7-b1fc-fb01d6e19452))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 7feec701-3e29-4c24-8584-7ce592d2719e))
-  (fp_line (start -9.75 2.25) (end -9.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 8150049e-843a-4c56-8511-3d30f14ce3c4))
-  (fp_line (start -7.25 2.25) (end -6.75 1.542893) (layer "F.Fab") (width 0.1) (tstamp 830c4f46-846d-4ce5-ba4f-9b86c87ff5ca))
-  (fp_line (start 5 0) (end 5.5 0) (layer "F.Fab") (width 0.1) (tstamp 85a8b5a3-0476-47e4-81ca-4d4c7a0fe925))
-  (fp_line (start -2.5 0) (end -2 0) (layer "F.Fab") (width 0.1) (tstamp 87fb42e9-dace-4061-a537-9a4e993e8142))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp 88121766-692f-4b1b-804c-ab568bb87496))
-  (fp_line (start -2 0) (end -2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 99f38f16-e975-4b2b-8c8c-7f3128932f64))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp 9cd9a9af-cd93-4115-b8ca-95815c45f312))
-  (fp_line (start -6.75 1.542893) (end -6.25 2.25) (layer "F.Fab") (width 0.1) (tstamp b5120c02-5766-4340-961a-ffe078980462))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp b7b67f43-25ce-4baf-aa2e-c3e6363b616b))
-  (fp_line (start -9.75 2.25) (end 9.75 2.25) (layer "F.Fab") (width 0.1) (tstamp b82e3db5-8b84-451b-8983-40435a00206b))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp c01cf215-2f73-4f83-a047-48b18b3da254))
-  (fp_line (start -7 -0.5) (end -7 0) (layer "F.Fab") (width 0.1) (tstamp d1f55780-74b5-43d4-a8ad-5b0f4b41e761))
-  (fp_line (start -9.75 -3.55) (end 9.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp d4b93f2d-2315-41fe-a9e9-1e4df4345416))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp d80c08ce-dc21-4262-8aae-29cfb511b093))
-  (fp_line (start -6.5 0) (end -6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp db4dcab5-e86f-4b82-9d47-48fe9c6aed09))
-  (fp_line (start 5 -0.5) (end 5 0) (layer "F.Fab") (width 0.1) (tstamp ef17cb45-d9c5-4ee5-a8b6-20c1b0ce9c63))
-  (fp_line (start -6.5 -0.5) (end -7 -0.5) (layer "F.Fab") (width 0.1) (tstamp fbf12afe-7502-4c13-ad08-4356d6fa6c9e))
-  (pad "1" smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7313e82f-0128-418d-b8b5-44b75f41473b))
-  (pad "2" smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 367a686e-071d-4983-a7b7-f29b0427453b))
-  (pad "3" smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ce3f1f29-cc01-40c9-9b0f-36189b0b9bf6))
-  (pad "4" smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f2b78419-86ad-4e34-a328-538cda1c6f46))
-  (pad "5" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b2ea89c7-db66-418c-aea3-3ec5a7f40934))
-  (pad "6" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c44c4ad9-a07d-4571-8ea0-c3e0b040597f))
-  (pad "7" smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2a3a4277-03c3-4b6e-bf76-d301b20728b4))
-  (pad "8" smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 59ae40af-465f-4387-985f-87abcf8f019b))
-  (pad "9" smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0dc5139b-c3ad-4dfb-aebd-4963dbd7a10d))
-  (pad "10" smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99774d61-8b0f-4820-8a99-fec85011ea29))
-  (pad "MP" smd roundrect (at 9.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 5c37a7d0-e5cd-4c7a-8336-893cf2faf45d))
-  (pad "MP" smd roundrect (at -9.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 9f677c39-b633-48d1-b557-15dc57101a44))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM10B-ZESS-TBT_1x10-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical.kicad_mod
index 8b763e8d4..1a4816936 100644
--- a/Connector_JST.pretty/JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,95 +1,151 @@
-(footprint "JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM11B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 476003f6-b171-4dd5-abdc-2688f984a3df)
   )
-  (fp_text value "JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f487c296-188d-47e4-acda-ec310b22cc46)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -10.5 2.25) (end 10.5 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.61 -0.39) (end -10.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.61 2.36) (end -8.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.16 2.36) (end -8.16 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.61 -0.39) (end 10.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.61 2.36) (end 8.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.94 -3.66) (end 8.94 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.5 -3.55) (end 10.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.5 2.25) (end -10.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.5 2.25) (end 10.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -0.5) (end -7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 0) (end -7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 0) (end -7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -0.5) (end -7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -0.5) (end -6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 0) (end -5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 0) (end -5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -0.5) (end -6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 0) (end -4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -0.5) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -0.5) (end -3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 0) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -0.5) (end -1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 0) (end -1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 0) (end -1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.5) (end -1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -0.5) (end 1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 0) (end 1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 0) (end 1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -0.5) (end 1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 0) (end 3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -0.5) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -0.5) (end 4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 0) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -0.5) (end 5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 0) (end 6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 0) (end 6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -0.5) (end 5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -0.5) (end 7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 0) (end 7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 0) (end 7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -0.5) (end 7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.5 -4.45) (end -11.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.5 4.45) (end 11.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.5 4.45) (end 11.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.5 -4.45) (end -11.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8 2.25) (end -7.5 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 1.542893) (end -7 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 7.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 10.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c48075ad-2317-4ee2-967b-88bd22a835be)
   )
-  (fp_line (start 10.61 2.36) (end 8.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp 01734565-10e1-4aab-9e11-9a7004bdc8ab))
-  (fp_line (start -8.16 2.36) (end -8.16 3.95) (layer "F.SilkS") (width 0.12) (tstamp 161eab20-dc6e-4b10-ae87-33b57a59e40d))
-  (fp_line (start 10.61 -0.39) (end 10.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp 557dc7d5-bb07-4f4e-9016-d2378e3c0b46))
-  (fp_line (start -8.94 -3.66) (end 8.94 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 9e687fbb-8df4-446c-8a50-a30108baac27))
-  (fp_line (start -10.61 2.36) (end -8.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp a60c68a5-b130-4293-946b-bf4ef3490b52))
-  (fp_line (start -10.61 -0.39) (end -10.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp cbe981ab-c8e8-407c-a87e-80be97ae484a))
-  (fp_line (start 11.5 4.45) (end 11.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 55965e4a-b7a3-4b40-8dea-11a39e8b27ac))
-  (fp_line (start -11.5 -4.45) (end -11.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 6076fb6e-85b4-4a58-86c7-c047ce008e00))
-  (fp_line (start 11.5 -4.45) (end -11.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 9ba49dd7-6f95-4c79-b177-6c0e86c8076c))
-  (fp_line (start -11.5 4.45) (end 11.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp b3cb7e42-62bf-439a-b596-a2a4cd0cdee7))
-  (fp_line (start -7.5 1.542893) (end -7 2.25) (layer "F.Fab") (width 0.1) (tstamp 0371f98e-52f1-491d-8d0c-1d3c5ffa9ffd))
-  (fp_line (start -4.25 0) (end -4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 08d80a90-3c7d-48cc-8299-984512c0e1a4))
-  (fp_line (start -3.25 -0.5) (end -3.25 0) (layer "F.Fab") (width 0.1) (tstamp 0bfb635e-98c5-4117-af61-4e54860d3c34))
-  (fp_line (start -3.25 0) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp 21cb1af0-57aa-43b6-b771-8413d8b2fd3f))
-  (fp_line (start 7.25 0) (end 7.75 0) (layer "F.Fab") (width 0.1) (tstamp 279d181a-b6cb-42bd-bdf0-750101be3ad3))
-  (fp_line (start -10.5 2.25) (end 10.5 2.25) (layer "F.Fab") (width 0.1) (tstamp 2b1e5d0e-4b66-4a11-aa70-b98e6e203f3f))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2bec9dc3-ae7d-4a4c-a53d-e01e8a1d8021))
-  (fp_line (start 5.75 -0.5) (end 5.75 0) (layer "F.Fab") (width 0.1) (tstamp 4f96110a-5dd3-4282-93d2-6adc292373e1))
-  (fp_line (start -1.75 0) (end -1.25 0) (layer "F.Fab") (width 0.1) (tstamp 503c0926-bd29-40a6-94c4-9d88c8ab1f30))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5bb99102-cff3-4889-ae69-7f2cc587bdd7))
-  (fp_line (start 7.75 -0.5) (end 7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5ef58c59-0868-42da-96df-bcfa28c34c3b))
-  (fp_line (start 2.75 -0.5) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 604cbac0-d12f-42a6-b371-7f530121aa75))
-  (fp_line (start 4.75 0) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 68b95697-f2d1-4e0d-8536-1c5c803d344d))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 6abcb77e-7efe-47d6-8c14-3f6a7402bc2b))
-  (fp_line (start 1.25 -0.5) (end 1.25 0) (layer "F.Fab") (width 0.1) (tstamp 726a51c2-14e4-45cb-82be-246d031c6c0f))
-  (fp_line (start -1.75 -0.5) (end -1.75 0) (layer "F.Fab") (width 0.1) (tstamp 7f5784e0-53fb-4b3a-88a3-88848bbd0ffd))
-  (fp_line (start 1.25 0) (end 1.75 0) (layer "F.Fab") (width 0.1) (tstamp 814ef9fa-6333-4883-817e-093b5548f79f))
-  (fp_line (start 6.25 -0.5) (end 5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 924412f4-d86a-44cd-a772-a0650f26712c))
-  (fp_line (start 7.25 -0.5) (end 7.25 0) (layer "F.Fab") (width 0.1) (tstamp 992f9068-1c00-4ae8-9d33-cdd2bde4821f))
-  (fp_line (start 10.5 2.25) (end 10.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp ac7dc43e-03c9-4822-8c91-f09692d1cafa))
-  (fp_line (start -10.5 2.25) (end -10.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp ad823315-aee9-4693-b9fa-ac9387c31bf4))
-  (fp_line (start -10.5 -3.55) (end 10.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp b3564fa7-5cbc-4578-bd4a-39095a17c929))
-  (fp_line (start 1.75 0) (end 1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp b46bb6b7-410d-41a2-a40f-dcb08ba879a2))
-  (fp_line (start -7.75 -0.5) (end -7.75 0) (layer "F.Fab") (width 0.1) (tstamp bb8cf4fd-3536-4f35-9497-e41cff9b7546))
-  (fp_line (start 4.25 0) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp bbd63922-611f-431e-b05f-674399184c7b))
-  (fp_line (start 1.75 -0.5) (end 1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp bdfc787d-0a46-4ccc-b1df-817c15dd7172))
-  (fp_line (start -4.75 0) (end -4.25 0) (layer "F.Fab") (width 0.1) (tstamp bf4ddf44-265c-4ed6-b750-33e3cad6f363))
-  (fp_line (start 4.75 -0.5) (end 4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp c427de24-7a53-497a-8502-ccab87d95405))
-  (fp_line (start -1.25 0) (end -1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp c6471434-c2fb-4b30-9067-27ea3548d515))
-  (fp_line (start -4.75 -0.5) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp c7743e16-4e05-4d6c-b570-eccff0e14fec))
-  (fp_line (start -7.75 0) (end -7.25 0) (layer "F.Fab") (width 0.1) (tstamp c77592de-9d17-444a-bd3f-2faead6189b1))
-  (fp_line (start -7.25 0) (end -7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp c7f31571-120d-4f87-b7fe-614a26db68e9))
-  (fp_line (start -7.25 -0.5) (end -7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp cbcd45b9-f2e6-4131-8985-a5aad1747761))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp cff0d959-b7a7-4103-943b-c779fea432da))
-  (fp_line (start 3.25 0) (end 3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp d60378dc-ddaf-48a2-a91e-7a195860227a))
-  (fp_line (start 5.75 0) (end 6.25 0) (layer "F.Fab") (width 0.1) (tstamp df30fe65-2723-47a0-a15c-17e9773da06b))
-  (fp_line (start -2.75 0) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp e1c3f1e6-400f-4370-8f22-16e966cbf905))
-  (fp_line (start -6.25 -0.5) (end -6.25 0) (layer "F.Fab") (width 0.1) (tstamp e3e78764-bf06-4857-8f40-238d71d4c6e1))
-  (fp_line (start -6.25 0) (end -5.75 0) (layer "F.Fab") (width 0.1) (tstamp e4cc5b5a-d77a-4048-a5b0-1c5d6aabd433))
-  (fp_line (start -5.75 0) (end -5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp e4fa5904-fa83-4368-8947-94a1a5d5fc01))
-  (fp_line (start 2.75 0) (end 3.25 0) (layer "F.Fab") (width 0.1) (tstamp e9ba7165-0ffb-4c30-8131-7133bac22b76))
-  (fp_line (start 7.75 0) (end 7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp ea82b72c-6c94-429e-80e9-d91762da2227))
-  (fp_line (start -4.25 -0.5) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp eabd47a9-2351-401c-a9b0-936b79d75496))
-  (fp_line (start -8 2.25) (end -7.5 1.542893) (layer "F.Fab") (width 0.1) (tstamp ef6d22ca-7b75-45d7-9051-6d38f0929a71))
-  (fp_line (start -2.75 -0.5) (end -3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp f0e8952f-02ba-42ab-a58c-009f5246ab7b))
-  (fp_line (start -1.25 -0.5) (end -1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp f172ac79-0553-41c5-88e9-ddd99ba7fd97))
-  (fp_line (start 4.25 -0.5) (end 4.25 0) (layer "F.Fab") (width 0.1) (tstamp f29d7a3c-ba10-4a3e-8adf-edd4a3d9a378))
-  (fp_line (start -5.75 -0.5) (end -6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp f4ab9748-8a36-4650-91e4-f64d0dbe5ca3))
-  (fp_line (start 6.25 0) (end 6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp f648f962-80dc-4284-84ce-ba1fc4303e95))
-  (fp_line (start 3.25 -0.5) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp fb58f3cc-0ae6-4514-94de-dc4e3514e312))
-  (pad "1" smd roundrect (at -7.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 62fee756-c052-4b09-aba6-7526914f794b))
-  (pad "2" smd roundrect (at -6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f0a46d5-b9f2-4814-a6a1-bcc0d018f5d3))
-  (pad "3" smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 13213eb7-2fc3-4685-b5c1-60ba4e5c3c6d))
-  (pad "4" smd roundrect (at -3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp badf6eb2-6f34-448d-a198-740e579a1c44))
-  (pad "5" smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a5430e34-f5bd-4505-9b54-0b3f24c036e2))
-  (pad "6" smd roundrect (at 0 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 254f1ee2-d2aa-40ec-a733-3e077ed3356f))
-  (pad "7" smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8966c14a-431e-4fa2-8ddd-3468b7b24c9e))
-  (pad "8" smd roundrect (at 3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dc2ab20c-a9ec-44fd-8a4e-879ceec3129a))
-  (pad "9" smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4e98bdf2-707c-4c4a-aa6f-58f1c97528c2))
-  (pad "10" smd roundrect (at 6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2aed3504-b265-4c80-b7c2-a860204476a3))
-  (pad "11" smd roundrect (at 7.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c6fb06f5-03a2-4ca1-b95b-ca30e9d824a3))
-  (pad "MP" smd roundrect (at -10.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 8c64e33b-ea0e-4a2d-82ea-78bd47678bfb))
-  (pad "MP" smd roundrect (at 10.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp b0370fdd-e036-4d51-bebd-802ef364b4e0))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM11B-ZESS-TBT_1x11-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical.kicad_mod
index 9d6f1c1da..e9183b732 100644
--- a/Connector_JST.pretty/JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,100 +1,160 @@
-(footprint "JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM12B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8fffecf6-be34-4fe2-8eca-97d2936d3e29)
   )
-  (fp_text value "JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp bde0fb1c-682f-45a5-9f07-b8e6e4d49bea)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -11.25 2.25) (end 11.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.36 -0.39) (end -11.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.36 2.36) (end -8.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.91 2.36) (end -8.91 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.36 -0.39) (end 11.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.36 2.36) (end 8.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.69 -3.66) (end 9.69 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.25 -3.55) (end 11.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 2.25) (end -11.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 2.25) (end 11.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -0.5) (end -8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 0) (end -8 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 0) (end -8 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 -0.5) (end -8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -0.5) (end -7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 0) (end -6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0) (end -6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.5) (end -7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -0.5) (end -5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 0) (end -5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 0) (end -5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.5) (end -5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.5) (end -2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0) (end -2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0) (end -2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.5) (end -2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -0.5) (end 2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 0) (end 2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 0) (end 2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -0.5) (end 2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 -0.5) (end 5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 0) (end 5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 0) (end 5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 -0.5) (end 5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -0.5) (end 6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 0) (end 7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 0) (end 7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 -0.5) (end 6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 -0.5) (end 8 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 0) (end 8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 0) (end 8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 -0.5) (end 8 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.25 -4.45) (end -12.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12.25 4.45) (end 12.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.25 4.45) (end 12.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.25 -4.45) (end -12.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.75 2.25) (end -8.25 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 1.542893) (end -7.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 8.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 10.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c2977c31-68fb-4013-86d9-2b192078c7b4)
   )
-  (fp_line (start -11.36 2.36) (end -8.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp 13b5738c-111d-458d-a332-341a0c54d7ec))
-  (fp_line (start 11.36 2.36) (end 8.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp 4b8fa794-184a-4367-9cf5-efe98ce0a503))
-  (fp_line (start -8.91 2.36) (end -8.91 3.95) (layer "F.SilkS") (width 0.12) (tstamp 4cd8e285-2176-4a98-b3c1-096763da4eb2))
-  (fp_line (start 11.36 -0.39) (end 11.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp af4dbe26-4268-4b51-9630-5844864c6e38))
-  (fp_line (start -11.36 -0.39) (end -11.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp dd70333f-cf5e-4f67-bb55-cfcac3dccabc))
-  (fp_line (start -9.69 -3.66) (end 9.69 -3.66) (layer "F.SilkS") (width 0.12) (tstamp f0775012-4908-4cc8-8883-a2a0db8efa99))
-  (fp_line (start -12.25 -4.45) (end -12.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 5d6f3bc6-9b87-439d-a70d-090da0922fb6))
-  (fp_line (start 12.25 4.45) (end 12.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 8639c4f5-489d-4ee1-bb62-a694e05bb2c2))
-  (fp_line (start 12.25 -4.45) (end -12.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp c1f0a46f-2482-42ea-bb17-0790905a6e90))
-  (fp_line (start -12.25 4.45) (end 12.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp d2e95c41-bc2a-4ccd-b302-a88e2e843d01))
-  (fp_line (start 2.5 -0.5) (end 2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0136cbd5-44e6-49ad-9d40-38bad733298e))
-  (fp_line (start -8.25 1.542893) (end -7.75 2.25) (layer "F.Fab") (width 0.1) (tstamp 12816c75-b156-454e-a4ee-633db80ac140))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1552bb4c-cb44-475f-86ba-87eb346dbb10))
-  (fp_line (start -7 -0.5) (end -7 0) (layer "F.Fab") (width 0.1) (tstamp 166671db-38e1-4c37-add0-4f23fcfcf2e6))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1e9b908d-c0d8-4d55-b1e1-2b0753f97641))
-  (fp_line (start 8.5 0) (end 8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 29efa7d3-4fb2-40e4-bed1-2f569e1935b1))
-  (fp_line (start -6.5 -0.5) (end -7 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2f007fb0-adaa-4c42-8fd5-598cb76fc754))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 303ce381-44fc-41d6-bc71-e3b7db059e96))
-  (fp_line (start -2.5 0) (end -2 0) (layer "F.Fab") (width 0.1) (tstamp 310abd4f-4b05-46e9-8523-18be61ebde7e))
-  (fp_line (start 8 0) (end 8.5 0) (layer "F.Fab") (width 0.1) (tstamp 380c529d-2f08-4085-985e-49f86e2349ad))
-  (fp_line (start -5.5 -0.5) (end -5.5 0) (layer "F.Fab") (width 0.1) (tstamp 3e1a0ab2-70fb-4b6e-ae2e-b199acfe2265))
-  (fp_line (start 6.5 0) (end 7 0) (layer "F.Fab") (width 0.1) (tstamp 3ef6614e-3f8f-4ff8-8b1e-8f03b87714aa))
-  (fp_line (start -5 0) (end -5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 448188ef-56bb-4f63-928b-04dcb26331fa))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp 5449c476-5f92-4030-bcd6-9903d30fd449))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp 55d8bc14-b4af-4b31-bb0b-fadd5b829883))
-  (fp_line (start 2 -0.5) (end 2 0) (layer "F.Fab") (width 0.1) (tstamp 56d940a2-cc2c-45ec-95ce-e5559a2cb0a4))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp 69b3d4b9-5ff8-47a6-a573-a2545dd8b011))
-  (fp_line (start 8.5 -0.5) (end 8 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6c89756a-467e-4c53-9780-3a8ea09f994a))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp 780e431a-98c7-4930-b9a9-c55719ecdf1b))
-  (fp_line (start 7 0) (end 7 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7b2a6bf9-b74d-4886-a690-ddef4cc3544e))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8634f7ec-5412-4b2c-96f6-0d67805d6a88))
-  (fp_line (start 5.5 -0.5) (end 5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 87581dbc-0736-40bd-a699-798b43b3b109))
-  (fp_line (start -5.5 0) (end -5 0) (layer "F.Fab") (width 0.1) (tstamp 8b6699a6-0a7c-4694-b687-345b6ea475cf))
-  (fp_line (start -8.5 -0.5) (end -8.5 0) (layer "F.Fab") (width 0.1) (tstamp 8cee5e1f-384b-412b-b9f8-435a8294608d))
-  (fp_line (start -11.25 2.25) (end -11.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp 9407502a-7c12-4a03-b0d0-03bda4b8338e))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 944a29dc-7654-4ce2-8576-d9a4fdc89ce6))
-  (fp_line (start 8 -0.5) (end 8 0) (layer "F.Fab") (width 0.1) (tstamp 94d2a4ec-1547-4fc7-9291-e9364d5c69fe))
-  (fp_line (start -11.25 2.25) (end 11.25 2.25) (layer "F.Fab") (width 0.1) (tstamp 963dd14b-cc00-400c-89f7-8e95630fdda5))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 9e163e00-1a1d-405a-974e-cc27470a624e))
-  (fp_line (start 5 0) (end 5.5 0) (layer "F.Fab") (width 0.1) (tstamp a46c5942-39f2-4e4d-87b8-dfce9c42c245))
-  (fp_line (start -5 -0.5) (end -5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b40cdb67-f8dd-4a29-93a3-08efb28f1395))
-  (fp_line (start 2 0) (end 2.5 0) (layer "F.Fab") (width 0.1) (tstamp b65d60f1-5d28-4618-9176-2b8376e06912))
-  (fp_line (start -8 -0.5) (end -8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp b8a7aa41-86a8-4263-a3af-14b395d4dfa6))
-  (fp_line (start -8.75 2.25) (end -8.25 1.542893) (layer "F.Fab") (width 0.1) (tstamp bb3092c3-b20b-44a6-897c-e1c187ed58cd))
-  (fp_line (start -11.25 -3.55) (end 11.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp bfc3b891-b0c9-46fb-b46d-13a5ff8670f0))
-  (fp_line (start -2.5 -0.5) (end -2.5 0) (layer "F.Fab") (width 0.1) (tstamp c0749e5e-b298-47f2-b92b-a47f3c4ecf82))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp c0af892c-3b53-4242-ac5b-472b8aa7a62e))
-  (fp_line (start 7 -0.5) (end 6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp c77cdfd1-f5bb-41b2-9ea1-260102278620))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp c98a702f-a0cb-4556-a3ed-fefa7481ddc0))
-  (fp_line (start 5 -0.5) (end 5 0) (layer "F.Fab") (width 0.1) (tstamp c9e8e71b-77cc-4c69-87ce-11d32f4fec00))
-  (fp_line (start -2 0) (end -2 -0.5) (layer "F.Fab") (width 0.1) (tstamp cdddec40-b748-4fd6-b7a0-5b0a4608518e))
-  (fp_line (start -2 -0.5) (end -2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp d1061d3a-ac84-43f4-8311-e170e9117644))
-  (fp_line (start 2.5 0) (end 2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp d1886933-3847-410d-be95-3b5134507ca3))
-  (fp_line (start 11.25 2.25) (end 11.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp d4a52e88-8791-4f47-a14f-665e6dd0880f))
-  (fp_line (start 6.5 -0.5) (end 6.5 0) (layer "F.Fab") (width 0.1) (tstamp d6b2ba72-79c9-4ff2-a598-f02293dc7e18))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp e030f0ab-b247-4a15-8d95-9244fe842516))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp e4dd9261-e0dd-47bd-9c67-5f834bd793f1))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e53a18fd-7e1e-4179-b66e-8aa42e2d78c1))
-  (fp_line (start 5.5 0) (end 5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp ed532019-e5f7-4a09-9ce0-0e3e154c0d66))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp edeb01dd-3ce3-423e-88d5-caef91374509))
-  (fp_line (start -8.5 0) (end -8 0) (layer "F.Fab") (width 0.1) (tstamp f7201d73-39cf-48c0-8d1a-16d6eb93a6d9))
-  (fp_line (start -6.5 0) (end -6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp f99abc20-848c-4b3a-bd26-b566e49b699d))
-  (fp_line (start -7 0) (end -6.5 0) (layer "F.Fab") (width 0.1) (tstamp fd145c66-a5f0-4c6d-b470-d379b27b8abc))
-  (fp_line (start -8 0) (end -8 -0.5) (layer "F.Fab") (width 0.1) (tstamp ffdff40f-3538-47b0-9650-da7167e7c9bf))
-  (pad "1" smd roundrect (at -8.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6c25ca0a-ccb2-4eff-ad35-9aab38aa2366))
-  (pad "2" smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9674c289-6656-4983-ae3a-ed49c198a33b))
-  (pad "3" smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4364b232-8a8f-44d4-945b-846cc1bf7c11))
-  (pad "4" smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a6f60235-a441-4366-9d34-ab10989c25e0))
-  (pad "5" smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b57bb883-4050-462a-b996-3598861f8638))
-  (pad "6" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2740f13c-7056-4969-abde-b5488919a782))
-  (pad "7" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp daa8eb0f-0a35-4de1-97c8-65ba60e5a643))
-  (pad "8" smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e9ca178d-e4a5-4ffd-b5d8-7398caceb02e))
-  (pad "9" smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f231a26-3f30-4619-9929-f56566c7e5af))
-  (pad "10" smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3578de64-9a92-49b3-aaec-e9636edfb1db))
-  (pad "11" smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d332aa9d-a0dc-42b8-a203-0dd7da197ff1))
-  (pad "12" smd roundrect (at 8.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1019cbad-b25d-4767-a24f-84dc732c075b))
-  (pad "MP" smd roundrect (at 10.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 3ac12027-5b90-4011-bbda-b14fa18c2cd4))
-  (pad "MP" smd roundrect (at -10.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e17fd2c4-6419-4cdb-87ca-0091cd2ecfe1))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM12B-ZESS-TBT_1x12-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical.kicad_mod
index 906b49497..e801e7ca7 100644
--- a/Connector_JST.pretty/JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,105 +1,169 @@
-(footprint "JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM13B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp aa9265de-9245-47b7-a564-270f9f31ae39)
   )
-  (fp_text value "JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5115ced8-5d1f-41b9-838e-3e21684e4a6c)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -12 2.25) (end 12 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.11 -0.39) (end -12.11 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.11 2.36) (end -9.66 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.66 2.36) (end -9.66 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.11 -0.39) (end 12.11 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.11 2.36) (end 9.66 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.44 -3.66) (end 10.44 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12 -3.55) (end 12 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12 2.25) (end -12 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12 2.25) (end 12 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -0.5) (end -9.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 0) (end -8.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 0) (end -8.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -0.5) (end -9.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -0.5) (end -7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 0) (end -7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 0) (end -7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -0.5) (end -7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -0.5) (end -6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 0) (end -5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 0) (end -5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -0.5) (end -6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 0) (end -4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -0.5) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -0.5) (end -3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 0) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -0.5) (end -1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 0) (end -1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 0) (end -1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.5) (end -1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -0.5) (end 1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 0) (end 1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 0) (end 1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -0.5) (end 1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 0) (end 3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -0.5) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -0.5) (end 4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 0) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -0.5) (end 5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 0) (end 6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 0) (end 6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -0.5) (end 5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -0.5) (end 7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 0) (end 7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 0) (end 7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -0.5) (end 7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -0.5) (end 8.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 0) (end 9.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 0) (end 9.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -0.5) (end 8.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13 -4.45) (end -13 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13 4.45) (end 13 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13 4.45) (end 13 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13 -4.45) (end -13 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.5 2.25) (end -9 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 1.542893) (end -8.5 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -7.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 7.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 9 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -11.6 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 11.6 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a254905c-f2af-4235-94f1-404419ef82ab)
   )
-  (fp_line (start 12.11 2.36) (end 9.66 2.36) (layer "F.SilkS") (width 0.12) (tstamp 14639f43-dff9-465f-a935-12b842436e47))
-  (fp_line (start -12.11 -0.39) (end -12.11 2.36) (layer "F.SilkS") (width 0.12) (tstamp 187cd3d6-e998-4d52-94ca-b4e44f40f663))
-  (fp_line (start -12.11 2.36) (end -9.66 2.36) (layer "F.SilkS") (width 0.12) (tstamp 1fc46772-bfd4-42d2-82bb-539f38e8aaf3))
-  (fp_line (start -10.44 -3.66) (end 10.44 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 53c2fb76-9629-4880-b12a-8aa982717771))
-  (fp_line (start 12.11 -0.39) (end 12.11 2.36) (layer "F.SilkS") (width 0.12) (tstamp 815ef5ae-3365-46a3-8428-f9f69569d049))
-  (fp_line (start -9.66 2.36) (end -9.66 3.95) (layer "F.SilkS") (width 0.12) (tstamp df0f0f04-edd1-436e-a708-2bae33b7a1d2))
-  (fp_line (start -13 4.45) (end 13 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 5f4d5260-4c8e-40b8-88ba-c37853d13335))
-  (fp_line (start 13 4.45) (end 13 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 89d994fe-7276-45a7-9977-af7582198ff0))
-  (fp_line (start 13 -4.45) (end -13 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp ac71e450-75c4-4915-9151-2beb080be3ff))
-  (fp_line (start -13 -4.45) (end -13 4.45) (layer "F.CrtYd") (width 0.05) (tstamp bcdb49cb-bc68-44b9-a107-feae41d2140b))
-  (fp_line (start 5.75 -0.5) (end 5.75 0) (layer "F.Fab") (width 0.1) (tstamp 05783f93-92cd-4a07-91ae-81edb90ac3de))
-  (fp_line (start 4.25 -0.5) (end 4.25 0) (layer "F.Fab") (width 0.1) (tstamp 07966b90-004a-4b99-9581-a8f3eef8e04d))
-  (fp_line (start -1.75 -0.5) (end -1.75 0) (layer "F.Fab") (width 0.1) (tstamp 08840d74-6a37-401e-8ef7-30a5bc922262))
-  (fp_line (start 2.75 -0.5) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 0b8465a4-3860-4a02-91b4-46a0dcd2805e))
-  (fp_line (start -4.25 0) (end -4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0c6a1a64-371e-44f7-9426-29e9e102fb85))
-  (fp_line (start -9.25 0) (end -8.75 0) (layer "F.Fab") (width 0.1) (tstamp 1175d5c1-0607-49a1-b564-58508e3edb6f))
-  (fp_line (start -7.75 0) (end -7.25 0) (layer "F.Fab") (width 0.1) (tstamp 12492c43-06b0-4115-8ab9-eb061ce0a58d))
-  (fp_line (start -6.25 -0.5) (end -6.25 0) (layer "F.Fab") (width 0.1) (tstamp 1e72c085-b8f2-44ed-a65e-5e845fada9d6))
-  (fp_line (start 3.25 -0.5) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2a16e8f7-fe4b-41b8-82a6-08f5c3dab670))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp 2ac0c2d5-5e31-45bd-a384-7942a4fb9ea1))
-  (fp_line (start 2.75 0) (end 3.25 0) (layer "F.Fab") (width 0.1) (tstamp 2ac70eea-867f-4a4c-a86f-60baeb3d2a87))
-  (fp_line (start 1.25 0) (end 1.75 0) (layer "F.Fab") (width 0.1) (tstamp 34fd9211-6e42-42ff-ae90-8fa44e0a9314))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3903fdcf-4b61-4eec-97a8-2da64ac65878))
-  (fp_line (start 6.25 0) (end 6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 47819cab-8088-4eea-ba7c-646548c085b1))
-  (fp_line (start 4.75 0) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4cb62735-e01e-41ea-adbc-f1da632705ef))
-  (fp_line (start 7.75 0) (end 7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4d40f834-332a-499c-a1fd-8385f452d4e7))
-  (fp_line (start -1.25 0) (end -1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5d7e8b7a-9c51-441f-97d7-e9895bc5c0ae))
-  (fp_line (start -12 2.25) (end 12 2.25) (layer "F.Fab") (width 0.1) (tstamp 60e45fc1-a4b4-4049-a82b-d84e4f06da72))
-  (fp_line (start 1.75 0) (end 1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 63cdfd21-c2db-4f3f-835c-f509b9c65cd1))
-  (fp_line (start 4.75 -0.5) (end 4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 66ef9b0c-80d1-4384-a715-d78c7d74d4e0))
-  (fp_line (start -5.75 0) (end -5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 68267995-2193-40a8-954b-51ac968b7aaa))
-  (fp_line (start -5.75 -0.5) (end -6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 68c1eaba-ef8f-4b0e-9b18-c637d851c495))
-  (fp_line (start 1.75 -0.5) (end 1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 69d568aa-23c5-4735-8489-42643e647f03))
-  (fp_line (start -4.75 0) (end -4.25 0) (layer "F.Fab") (width 0.1) (tstamp 6a6f42c4-cb27-4dcb-9205-02e6b2ab7a0c))
-  (fp_line (start -9 1.542893) (end -8.5 2.25) (layer "F.Fab") (width 0.1) (tstamp 6a728f0c-2781-42be-9ec9-4d5cb2e0c030))
-  (fp_line (start -7.75 -0.5) (end -7.75 0) (layer "F.Fab") (width 0.1) (tstamp 71e73df7-fbb5-48d9-8652-201b1400efc5))
-  (fp_line (start 5.75 0) (end 6.25 0) (layer "F.Fab") (width 0.1) (tstamp 7370a308-3b81-480b-86cd-65789a4264e9))
-  (fp_line (start -9.5 2.25) (end -9 1.542893) (layer "F.Fab") (width 0.1) (tstamp 74d2b351-a8f2-47d0-ab8f-6aa7c115a1c8))
-  (fp_line (start -1.75 0) (end -1.25 0) (layer "F.Fab") (width 0.1) (tstamp 8a3b9378-084f-4a0d-bfe7-0f5ce6f2d24d))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp 8a944f45-468e-4007-b827-8352d4f3c3af))
-  (fp_line (start -9.25 -0.5) (end -9.25 0) (layer "F.Fab") (width 0.1) (tstamp 8df5ec6b-fa7c-4397-ac53-67ffa2dc2093))
-  (fp_line (start -2.75 -0.5) (end -3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8e5136bf-b439-41d6-a035-c4e13b1bc72f))
-  (fp_line (start -6.25 0) (end -5.75 0) (layer "F.Fab") (width 0.1) (tstamp 932ae0cc-6044-4db4-bf59-5398f9c5f6c1))
-  (fp_line (start -2.75 0) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 98b23c6a-8fb1-48b0-b45d-b10897e5e54c))
-  (fp_line (start 1.25 -0.5) (end 1.25 0) (layer "F.Fab") (width 0.1) (tstamp 9ac456ac-0618-4869-9167-b07b5db42b4e))
-  (fp_line (start -12 2.25) (end -12 -3.55) (layer "F.Fab") (width 0.1) (tstamp 9b1c722a-1669-4af7-a07e-4f679085ae9d))
-  (fp_line (start -4.25 -0.5) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9bceb12d-6637-4577-95d5-4fc1f121d33a))
-  (fp_line (start 9.25 0) (end 9.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp a11a76f8-873c-4115-9917-e30e1aebe4ac))
-  (fp_line (start 8.75 0) (end 9.25 0) (layer "F.Fab") (width 0.1) (tstamp a17a95af-99ff-40ed-9cc6-23a3ad2be9bd))
-  (fp_line (start -8.75 -0.5) (end -9.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp a3813f45-7639-418c-a5c4-c38ceaea3794))
-  (fp_line (start -4.75 -0.5) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp a6450d93-5a2b-47c6-8967-197c9ae713ab))
-  (fp_line (start 7.25 0) (end 7.75 0) (layer "F.Fab") (width 0.1) (tstamp a948d218-a497-4796-b273-bb73862e9974))
-  (fp_line (start 12 2.25) (end 12 -3.55) (layer "F.Fab") (width 0.1) (tstamp af892d6b-e76e-4d5b-9df0-662cc73b86d4))
-  (fp_line (start 7.25 -0.5) (end 7.25 0) (layer "F.Fab") (width 0.1) (tstamp b6d1233c-c3fe-47b8-b67c-cacbc8b7deb3))
-  (fp_line (start -7.25 -0.5) (end -7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp bc8e4c29-9bc0-47ea-95c5-bacc9c8910fb))
-  (fp_line (start 9.25 -0.5) (end 8.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp bd920c74-49c9-437d-9014-23b88aa0dc87))
-  (fp_line (start -3.25 0) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp be3bb6f4-2d25-4732-90d2-431103406db7))
-  (fp_line (start 8.75 -0.5) (end 8.75 0) (layer "F.Fab") (width 0.1) (tstamp c6f2fed9-e114-41a7-840b-3682614efd98))
-  (fp_line (start -3.25 -0.5) (end -3.25 0) (layer "F.Fab") (width 0.1) (tstamp cdaa2112-f8b7-46b7-8830-f50174d9777a))
-  (fp_line (start 4.25 0) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp cf443bd5-65fa-425b-8b96-3fea4ca6c322))
-  (fp_line (start 7.75 -0.5) (end 7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp d02579f4-fc1c-47f7-8ada-627103d3d18b))
-  (fp_line (start 3.25 0) (end 3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp d217ee79-900c-44b7-846c-6c87d4d17691))
-  (fp_line (start 6.25 -0.5) (end 5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp d2845581-c0a8-4e46-83ab-c688f303bab9))
-  (fp_line (start -1.25 -0.5) (end -1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp dc7b55e5-2a58-4ca7-88f5-d1b338ac3be4))
-  (fp_line (start -8.75 0) (end -8.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp e08a532a-bf92-4b3e-b3f1-59d569a35a19))
-  (fp_line (start -7.25 0) (end -7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp e1eff9ad-a63c-44bd-895f-1b09179fb3c8))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp f21a3655-2d06-4e72-9b8e-bd58a164caf7))
-  (fp_line (start -12 -3.55) (end 12 -3.55) (layer "F.Fab") (width 0.1) (tstamp f32e8fb2-47a4-4f13-a67c-2b397b9e4052))
-  (pad "1" smd roundrect (at -9 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dcd0fc77-63fd-4281-8216-4d1ff5591ffc))
-  (pad "2" smd roundrect (at -7.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5c9eaa4-c054-4478-94b4-fbede1f166f7))
-  (pad "3" smd roundrect (at -6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e65f0504-2008-4b64-902e-d15c6fb6288d))
-  (pad "4" smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5d3e9b69-0a3f-40be-91ab-c88cacb038d5))
-  (pad "5" smd roundrect (at -3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 472ba8a2-49d2-48f3-96bd-8aaa5c8b6005))
-  (pad "6" smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f712603e-15e0-463c-a25b-d9201bf20226))
-  (pad "7" smd roundrect (at 0 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4ce34aec-3f47-4cbb-89db-daaf98df69d7))
-  (pad "8" smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4f032054-2208-45bb-83cc-b16f4501f51a))
-  (pad "9" smd roundrect (at 3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c7443825-f77b-492b-951a-9b0de5576f9f))
-  (pad "10" smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 75b85b92-a4c5-4024-a5ba-8e9c7dfafef1))
-  (pad "11" smd roundrect (at 6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d40f416f-bb72-4d77-bf84-bd23bb25b45b))
-  (pad "12" smd roundrect (at 7.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp deccb88e-46bc-4466-be0e-5762b4673ed9))
-  (pad "13" smd roundrect (at 9 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 84261bae-aae1-4e92-8394-74ab072fdb1c))
-  (pad "MP" smd roundrect (at 11.6 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 012ba715-8502-4f7f-9369-ed1a03041a56))
-  (pad "MP" smd roundrect (at -11.6 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 8013e5b5-549d-42f5-8b6c-7ea10252b87f))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM13B-ZESS-TBT_1x13-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical.kicad_mod
index 4bdfe391a..e6adcfafe 100644
--- a/Connector_JST.pretty/JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,110 +1,178 @@
-(footprint "JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM14B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d49d82d8-ab4d-4c74-9760-12f7593376dc)
   )
-  (fp_text value "JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 622389d7-495c-4668-98da-a16ab9e271fd)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -12.75 2.25) (end 12.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.86 -0.39) (end -12.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.86 2.36) (end -10.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.41 2.36) (end -10.41 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.86 -0.39) (end 12.86 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.86 2.36) (end 10.41 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.19 -3.66) (end 11.19 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.75 -3.55) (end 12.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.75 2.25) (end -12.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.75 2.25) (end 12.75 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 -0.5) (end -10 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 0) (end -9.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.5 0) (end -9.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.5 -0.5) (end -10 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -0.5) (end -8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 0) (end -8 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 0) (end -8 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 -0.5) (end -8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -0.5) (end -7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 0) (end -6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0) (end -6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.5) (end -7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -0.5) (end -5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 0) (end -5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 0) (end -5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.5) (end -5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.5) (end -2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0) (end -2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0) (end -2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.5) (end -2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -0.5) (end 2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 0) (end 2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 0) (end 2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -0.5) (end 2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 -0.5) (end 5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 0) (end 5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 0) (end 5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 -0.5) (end 5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -0.5) (end 6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 0) (end 7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 0) (end 7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 -0.5) (end 6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 -0.5) (end 8 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 0) (end 8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 0) (end 8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 -0.5) (end 8 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.5 -0.5) (end 9.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.5 0) (end 10 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10 0) (end 10 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10 -0.5) (end 9.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.75 -4.45) (end -13.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13.75 4.45) (end 13.75 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.75 4.45) (end 13.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.75 -4.45) (end -13.75 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.25 2.25) (end -9.75 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 1.542893) (end -9.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -8.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 8.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 9.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -12.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 12.35 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e3b3fe76-e61d-46be-b241-fbe6387e42e6)
   )
-  (fp_line (start -10.41 2.36) (end -10.41 3.95) (layer "F.SilkS") (width 0.12) (tstamp 22a58a6a-2800-4e3f-a7b4-de07a77e44ab))
-  (fp_line (start -12.86 -0.39) (end -12.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp 45cfa055-c462-459c-afcd-ead9f0d51508))
-  (fp_line (start 12.86 -0.39) (end 12.86 2.36) (layer "F.SilkS") (width 0.12) (tstamp 51055888-f558-45d8-8d4f-978c9119647c))
-  (fp_line (start -12.86 2.36) (end -10.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp 7aba357e-fcba-4626-8831-81e489f51822))
-  (fp_line (start 12.86 2.36) (end 10.41 2.36) (layer "F.SilkS") (width 0.12) (tstamp 8598ae21-91cf-403a-91e4-06836d6b94dc))
-  (fp_line (start -11.19 -3.66) (end 11.19 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 8f4c9979-9486-4fd7-a277-293ff8ee1a8e))
-  (fp_line (start -13.75 4.45) (end 13.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 2d9c2a91-cfea-4593-a914-887e26956884))
-  (fp_line (start 13.75 4.45) (end 13.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 833c9808-537d-4fb9-bb64-ba91297442e8))
-  (fp_line (start -13.75 -4.45) (end -13.75 4.45) (layer "F.CrtYd") (width 0.05) (tstamp add46d1a-4fd3-40ae-841d-b1fe97cf6e24))
-  (fp_line (start 13.75 -4.45) (end -13.75 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp d08fe8db-8bc0-4c36-9a6d-869b60ca5ebe))
-  (fp_line (start -8 0) (end -8 -0.5) (layer "F.Fab") (width 0.1) (tstamp 05eef2e1-d6ec-45af-aaa2-6a25036701f5))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0821ea62-22db-4d10-8910-e2c8f2cb378c))
-  (fp_line (start -8 -0.5) (end -8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0882c4b6-6e14-4475-8cf6-bdd75a439cf4))
-  (fp_line (start 10 -0.5) (end 9.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0c9bb51f-ad2d-482e-b25d-3965429ce538))
-  (fp_line (start 7 -0.5) (end 6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0fe75df5-6dee-437c-97aa-ac9ce8737e46))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 134a3c87-1b98-4c86-a9e1-c19d70b5d942))
-  (fp_line (start 2.5 0) (end 2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 14c3200c-3f5e-4010-b004-b8ad3c6e5b87))
-  (fp_line (start -6.5 -0.5) (end -7 -0.5) (layer "F.Fab") (width 0.1) (tstamp 177909ef-fb9c-41af-8c32-261e3c38d9be))
-  (fp_line (start 5 -0.5) (end 5 0) (layer "F.Fab") (width 0.1) (tstamp 1a99936d-f1f8-42f5-bf41-23ca565fc696))
-  (fp_line (start 2 -0.5) (end 2 0) (layer "F.Fab") (width 0.1) (tstamp 21d68581-0f51-4b67-a309-101ae1de13aa))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 25660f5a-e192-4ecb-9b86-503534e167be))
-  (fp_line (start 5 0) (end 5.5 0) (layer "F.Fab") (width 0.1) (tstamp 26bd00f9-1c8d-4df6-b84b-aeda0c730cc9))
-  (fp_line (start -10 -0.5) (end -10 0) (layer "F.Fab") (width 0.1) (tstamp 2b8439dd-bcbf-48eb-a262-f0b8763e32fd))
-  (fp_line (start 2.5 -0.5) (end 2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2ded5c6a-cd7b-4adf-a195-487c6bd13cc1))
-  (fp_line (start -6.5 0) (end -6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2efdf1f7-640e-4e4d-9a69-e0ff0443b9d8))
-  (fp_line (start 8.5 0) (end 8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3588997e-ad36-433f-b130-a0d8ae3e27c6))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp 36aa153e-82af-4f03-8ea2-a540aa624cd6))
-  (fp_line (start -2.5 -0.5) (end -2.5 0) (layer "F.Fab") (width 0.1) (tstamp 3e9e1202-db1a-415a-80f2-861b1f8f5b89))
-  (fp_line (start -10 0) (end -9.5 0) (layer "F.Fab") (width 0.1) (tstamp 47df138f-51c5-44dc-8a99-29eb7f753d78))
-  (fp_line (start -10.25 2.25) (end -9.75 1.542893) (layer "F.Fab") (width 0.1) (tstamp 4925e0b3-0fe1-4fd6-9b63-5c3ee56cc8f6))
-  (fp_line (start -12.75 -3.55) (end 12.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 4bc8a95b-9345-4d49-a6c8-10f525c1729f))
-  (fp_line (start -8.5 -0.5) (end -8.5 0) (layer "F.Fab") (width 0.1) (tstamp 4fe2d0af-4995-4665-9a3a-f49e79e9b807))
-  (fp_line (start 2 0) (end 2.5 0) (layer "F.Fab") (width 0.1) (tstamp 54b217f2-2742-48cc-b732-92e5465a04bf))
-  (fp_line (start -2 0) (end -2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 55653ae7-1129-42d6-992b-cefe03bd4885))
-  (fp_line (start 7 0) (end 7 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5d45a405-c161-4552-aba5-526839f3c1d5))
-  (fp_line (start -12.75 2.25) (end -12.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp 5d89cede-256a-4b95-8b3e-45367f95aa17))
-  (fp_line (start 5.5 -0.5) (end 5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 64803e65-79d8-40da-97ca-2d6de3ca7f91))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp 720276b6-e141-4e70-9b0c-321117e3409b))
-  (fp_line (start 8.5 -0.5) (end 8 -0.5) (layer "F.Fab") (width 0.1) (tstamp 73cc5264-cb54-4b1b-b39e-a307f58de650))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 7bf6f7f2-ed79-4dd3-80f3-7247380988fb))
-  (fp_line (start 9.5 -0.5) (end 9.5 0) (layer "F.Fab") (width 0.1) (tstamp 83ff4ea8-8453-4095-9cde-0e8070baa547))
-  (fp_line (start -7 0) (end -6.5 0) (layer "F.Fab") (width 0.1) (tstamp 8592e3cb-631b-4080-bc6a-56a727500339))
-  (fp_line (start -2 -0.5) (end -2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 89e42adf-f502-4a43-b6b0-7203d29d8c75))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8b9e96bf-93c3-4da8-9c2f-24accaf86d84))
-  (fp_line (start 9.5 0) (end 10 0) (layer "F.Fab") (width 0.1) (tstamp 8e846002-1da7-4974-9181-8ea29097070b))
-  (fp_line (start -12.75 2.25) (end 12.75 2.25) (layer "F.Fab") (width 0.1) (tstamp 972d40b8-8f1e-4826-8094-3704fbbf2b64))
-  (fp_line (start 10 0) (end 10 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9a1c0211-01c5-4cef-a365-942a62f92e07))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp 9f09ff53-491c-4e93-b6a9-ec3659d861fa))
-  (fp_line (start -5.5 -0.5) (end -5.5 0) (layer "F.Fab") (width 0.1) (tstamp a08a9db1-5c21-4968-8078-989d57bee9ab))
-  (fp_line (start -9.5 0) (end -9.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp aa46303c-974b-4123-b0e8-5731a32f4789))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp ad07df1d-2815-463f-b0db-81b8f44d7491))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp b03e539f-9a0f-4fe1-a328-3e83a7e1e3f7))
-  (fp_line (start 8 -0.5) (end 8 0) (layer "F.Fab") (width 0.1) (tstamp b138298b-d092-424e-bbee-49129f621d5f))
-  (fp_line (start 5.5 0) (end 5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp c07b1939-145c-451d-8b99-db8451bd86c3))
-  (fp_line (start 6.5 -0.5) (end 6.5 0) (layer "F.Fab") (width 0.1) (tstamp c11a45ef-03da-45eb-b095-371229d6b962))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp c1b7b782-5c1d-46fd-9e1b-a25d17369450))
-  (fp_line (start -9.5 -0.5) (end -10 -0.5) (layer "F.Fab") (width 0.1) (tstamp c839a6a8-b866-4533-8727-7308692ef16f))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp c8ae526a-08e1-4782-bb6c-e07a193b8a0a))
-  (fp_line (start -5 -0.5) (end -5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp cb07d6c8-dde0-4f68-a081-f4208cad593f))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp ccb0acdb-1892-43fa-b3b4-d25de0f509f7))
-  (fp_line (start 8 0) (end 8.5 0) (layer "F.Fab") (width 0.1) (tstamp d25c303f-3976-4023-b053-5bd84430cb24))
-  (fp_line (start -5.5 0) (end -5 0) (layer "F.Fab") (width 0.1) (tstamp d306a3ee-9402-4967-9e85-f28d8329c5fb))
-  (fp_line (start -8.5 0) (end -8 0) (layer "F.Fab") (width 0.1) (tstamp e1f7f237-5799-437f-8d9f-ad64ddbb9f19))
-  (fp_line (start -5 0) (end -5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e315679c-e8e7-43e3-affb-2fac7eecd481))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp e3976eff-09ee-4d5e-ba60-a78e161fc576))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e53393e8-661c-40e2-a253-8be0097c8407))
-  (fp_line (start -9.75 1.542893) (end -9.25 2.25) (layer "F.Fab") (width 0.1) (tstamp e7ce9c54-b132-4422-9764-09d3e27f2300))
-  (fp_line (start 6.5 0) (end 7 0) (layer "F.Fab") (width 0.1) (tstamp e9884e85-2859-4be3-8098-78a038351d18))
-  (fp_line (start 12.75 2.25) (end 12.75 -3.55) (layer "F.Fab") (width 0.1) (tstamp f2f3ae3d-3d1d-4547-89ce-8be5732ee6b4))
-  (fp_line (start -7 -0.5) (end -7 0) (layer "F.Fab") (width 0.1) (tstamp f379ebcb-0d9b-4c82-bbe4-2768bc4a1609))
-  (fp_line (start -2.5 0) (end -2 0) (layer "F.Fab") (width 0.1) (tstamp f7a21bb6-ca8c-4335-8b85-ce02e51bd5a8))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp fe0e4f27-d8ac-4223-b327-2f8e8c18e211))
-  (pad "1" smd roundrect (at -9.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d16ae657-e8ee-4ad5-955c-59cb7731115c))
-  (pad "2" smd roundrect (at -8.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ff6053e3-1b43-44c1-affc-9a0d7762dcc6))
-  (pad "3" smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9f3c7e5e-ffa7-4639-beb5-5638d425f80c))
-  (pad "4" smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7cd7be9d-f2c6-4b64-a11d-90fdc88524bd))
-  (pad "5" smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d645c4c8-1e77-492c-aa18-1816b1110e6f))
-  (pad "6" smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 363b0ea3-0890-4b10-bd41-cd8eede9b004))
-  (pad "7" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 386b56a9-8521-4305-ab01-30edf137eb5d))
-  (pad "8" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 14941540-f3e8-4420-8a4b-3a6eb79cab7d))
-  (pad "9" smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp eb0fea1e-dee9-4ae9-9ac9-7b2a192ffb52))
-  (pad "10" smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fb27363a-1ab0-480e-86ba-5fb25a21fb8c))
-  (pad "11" smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4e465c45-ea55-4531-9900-9213542576cd))
-  (pad "12" smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp aa47ce25-c003-4fe6-9f0d-04fda226a3a8))
-  (pad "13" smd roundrect (at 8.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ed523761-1a22-416a-b0bf-db4af4f3aff0))
-  (pad "14" smd roundrect (at 9.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 132dba8c-4e8e-42c5-9a22-993d8344b719))
-  (pad "MP" smd roundrect (at 12.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp b716a2cb-bade-4708-97be-dbb53e7ac92e))
-  (pad "MP" smd roundrect (at -12.35 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp baad0a06-2fea-414f-a512-6da0537b20c8))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM14B-ZESS-TBT_1x14-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical.kicad_mod
index e22458b12..a01a02dd5 100644
--- a/Connector_JST.pretty/JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,115 +1,187 @@
-(footprint "JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM15B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 73bacf62-029e-42cc-8e5a-7c40c031dffb)
   )
-  (fp_text value "JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 42c2e27c-f083-492c-9173-b12d0895069d)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -13.5 2.25) (end 13.5 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.61 -0.39) (end -13.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.61 2.36) (end -11.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.16 2.36) (end -11.16 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.61 -0.39) (end 13.61 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.61 2.36) (end 11.16 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.94 -3.66) (end 11.94 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.5 -3.55) (end 13.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.5 2.25) (end -13.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.5 2.25) (end 13.5 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -0.5) (end -10.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 0) (end -10.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 0) (end -10.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.25 -0.5) (end -10.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -0.5) (end -9.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 0) (end -8.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 0) (end -8.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.75 -0.5) (end -9.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -0.5) (end -7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 0) (end -7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 0) (end -7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.25 -0.5) (end -7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -0.5) (end -6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 0) (end -5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 0) (end -5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.75 -0.5) (end -6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -0.5) (end -4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 0) (end -4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 0) (end -4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.25 -0.5) (end -4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 -0.5) (end -3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.25 0) (end -2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 0) (end -2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.75 -0.5) (end -3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 -0.5) (end -1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.75 0) (end -1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 0) (end -1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.25 -0.5) (end -1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 -0.5) (end -0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.25 0) (end 0.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 0) (end 0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.25 -0.5) (end -0.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 -0.5) (end 1.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.25 0) (end 1.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 0) (end 1.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1.75 -0.5) (end 1.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 -0.5) (end 2.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.75 0) (end 3.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 0) (end 3.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.25 -0.5) (end 2.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 -0.5) (end 4.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.25 0) (end 4.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 0) (end 4.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.75 -0.5) (end 4.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 -0.5) (end 5.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.75 0) (end 6.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 0) (end 6.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.25 -0.5) (end 5.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 -0.5) (end 7.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.25 0) (end 7.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 0) (end 7.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.75 -0.5) (end 7.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 -0.5) (end 8.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.75 0) (end 9.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 0) (end 9.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.25 -0.5) (end 8.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 -0.5) (end 10.25 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.25 0) (end 10.75 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 0) (end 10.75 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.75 -0.5) (end 10.25 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.5 -4.45) (end -14.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -14.5 4.45) (end 14.5 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.5 4.45) (end 14.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.5 -4.45) (end -14.5 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11 2.25) (end -10.5 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.5 1.542893) (end -10 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -10.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -9 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -7.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 7.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 9 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 10.5 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -13.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 13.1 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ff1ca596-02c8-43f1-b332-b42de48ba493)
   )
-  (fp_line (start -11.94 -3.66) (end 11.94 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 1901bc7d-1335-4940-87d4-cdde1eff60b6))
-  (fp_line (start -13.61 2.36) (end -11.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp 3e205b7b-9e43-4029-945d-1c68d9a63cdd))
-  (fp_line (start 13.61 2.36) (end 11.16 2.36) (layer "F.SilkS") (width 0.12) (tstamp 6d1ce778-c4f8-4755-a6cf-364862fd6d12))
-  (fp_line (start -11.16 2.36) (end -11.16 3.95) (layer "F.SilkS") (width 0.12) (tstamp 7af3259a-520a-4686-9737-f986018d5b5d))
-  (fp_line (start -13.61 -0.39) (end -13.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp aa8083c8-96fe-4ff3-9489-4d3d86ba8e40))
-  (fp_line (start 13.61 -0.39) (end 13.61 2.36) (layer "F.SilkS") (width 0.12) (tstamp abf5b841-5ca4-47b2-86a4-b9c13b27c0f7))
-  (fp_line (start 14.5 -4.45) (end -14.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 047b5cbd-49be-4def-b416-0e9d4d467bb4))
-  (fp_line (start 14.5 4.45) (end 14.5 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 64b49daa-840f-4633-a46f-fb2f3f519a24))
-  (fp_line (start -14.5 -4.45) (end -14.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 8b3a9178-f5ac-4f0f-a899-4e0c6abc50fc))
-  (fp_line (start -14.5 4.45) (end 14.5 4.45) (layer "F.CrtYd") (width 0.05) (tstamp a0ff08d0-3c2c-43ce-af8d-fe076a0d83a6))
-  (fp_line (start -1.25 -0.5) (end -1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 012230d8-9369-4d0f-a318-05180e63fdc1))
-  (fp_line (start -4.25 0) (end -4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 02dcf735-0b58-4801-ad56-20733bfc5389))
-  (fp_line (start -7.75 -0.5) (end -7.75 0) (layer "F.Fab") (width 0.1) (tstamp 072b9a25-1cdb-4a27-a397-0c61ce7a4c25))
-  (fp_line (start 4.25 -0.5) (end 4.25 0) (layer "F.Fab") (width 0.1) (tstamp 07e4e7c9-ab3a-4c78-bbbe-7a758989b8cb))
-  (fp_line (start -2.75 -0.5) (end -3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 0b7924db-87e9-4502-a4a4-f9df2f7ba5bc))
-  (fp_line (start -13.5 -3.55) (end 13.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp 171224da-6d44-4eab-921b-384d3149c7d0))
-  (fp_line (start 6.25 0) (end 6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 1aa7de0f-7b70-446f-85dd-6cb4cc00c56e))
-  (fp_line (start -8.75 -0.5) (end -9.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 205c647b-e1f1-40d6-a54f-db32cd63b673))
-  (fp_line (start -10.25 0) (end -10.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 206f17f3-cc26-472d-a6b2-c566a13299a2))
-  (fp_line (start 10.75 -0.5) (end 10.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 221f58d9-2c77-4252-b258-3feb53e66985))
-  (fp_line (start -4.75 0) (end -4.25 0) (layer "F.Fab") (width 0.1) (tstamp 25f8e2eb-33e3-49e9-a130-b5dcd20eb6fa))
-  (fp_line (start -4.25 -0.5) (end -4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 26d744cc-c42e-4da6-97af-1dd4d8bb614c))
-  (fp_line (start -3.25 0) (end -2.75 0) (layer "F.Fab") (width 0.1) (tstamp 282fd3e2-d480-49a1-bd37-d292d2214f8e))
-  (fp_line (start 1.75 0) (end 1.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2c95842b-8426-443f-be6d-5bb07cfa1513))
-  (fp_line (start -10.25 -0.5) (end -10.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2cee0555-e1b9-414b-a5db-a9542b0500fe))
-  (fp_line (start -10.75 0) (end -10.25 0) (layer "F.Fab") (width 0.1) (tstamp 2d8232be-8e6f-405e-9ef9-5bc2b4499f46))
-  (fp_line (start 13.5 2.25) (end 13.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp 310e08b5-ddf2-4d50-b879-c016ace8cf5a))
-  (fp_line (start -2.75 0) (end -2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 345035a8-4f71-42a8-b381-2c9de2b4e140))
-  (fp_line (start 7.25 0) (end 7.75 0) (layer "F.Fab") (width 0.1) (tstamp 47174830-4375-4f47-9273-8f3da4444e8d))
-  (fp_line (start 4.75 -0.5) (end 4.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 4b7030fc-9912-4ee5-af45-976984083d5d))
-  (fp_line (start 8.75 -0.5) (end 8.75 0) (layer "F.Fab") (width 0.1) (tstamp 586164f0-ee66-425c-ab0a-d877bef2872c))
-  (fp_line (start 1.25 0) (end 1.75 0) (layer "F.Fab") (width 0.1) (tstamp 5a5cd394-173f-4042-96ab-55c87c776db8))
-  (fp_line (start 10.75 0) (end 10.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5bd01965-60c2-4782-989b-0f254ea43dad))
-  (fp_line (start 1.75 -0.5) (end 1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5d04dac0-4137-4e02-b2c2-7d706db0a5cf))
-  (fp_line (start -9.25 -0.5) (end -9.25 0) (layer "F.Fab") (width 0.1) (tstamp 5e1b0746-63f2-41eb-9699-41054ef061e3))
-  (fp_line (start -10.5 1.542893) (end -10 2.25) (layer "F.Fab") (width 0.1) (tstamp 6a963455-8ad6-4d0d-a2ec-f402c7e71c46))
-  (fp_line (start -1.75 0) (end -1.25 0) (layer "F.Fab") (width 0.1) (tstamp 7ed99b5b-4eae-4382-96b1-f05f27926109))
-  (fp_line (start -6.25 0) (end -5.75 0) (layer "F.Fab") (width 0.1) (tstamp 85179b91-adcb-4097-b1c3-207ad31e2e79))
-  (fp_line (start -7.75 0) (end -7.25 0) (layer "F.Fab") (width 0.1) (tstamp 87d8b2a7-9931-47f3-bd5b-1341533a68d8))
-  (fp_line (start 2.75 -0.5) (end 2.75 0) (layer "F.Fab") (width 0.1) (tstamp 89070a9c-a456-4408-a602-e371288d73e3))
-  (fp_line (start 5.75 -0.5) (end 5.75 0) (layer "F.Fab") (width 0.1) (tstamp 952ea057-4111-4590-a0f8-657c918b552a))
-  (fp_line (start -5.75 0) (end -5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 95b928b3-7d64-4eff-820a-bc6e48f17823))
-  (fp_line (start 6.25 -0.5) (end 5.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp 96359d1e-3f9d-49c0-b570-2b40abee50cd))
-  (fp_line (start 0.25 -0.5) (end -0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp 994f0f18-2839-4ff2-9078-38c5ee45603b))
-  (fp_line (start 8.75 0) (end 9.25 0) (layer "F.Fab") (width 0.1) (tstamp 99d5fbf7-dd45-4b18-a637-21f2818b3a71))
-  (fp_line (start 2.75 0) (end 3.25 0) (layer "F.Fab") (width 0.1) (tstamp 9c8c77c4-55de-4d43-ac43-fe0d01744ba1))
-  (fp_line (start 5.75 0) (end 6.25 0) (layer "F.Fab") (width 0.1) (tstamp a1afe0fa-8c8a-47ad-8c17-6580019e34bc))
-  (fp_line (start 1.25 -0.5) (end 1.25 0) (layer "F.Fab") (width 0.1) (tstamp a30fd722-6c77-4c58-ac61-bcafb4d05a9a))
-  (fp_line (start -13.5 2.25) (end -13.5 -3.55) (layer "F.Fab") (width 0.1) (tstamp a82511c5-80f8-4cd2-a1ca-4d372eb598cc))
-  (fp_line (start -0.25 0) (end 0.25 0) (layer "F.Fab") (width 0.1) (tstamp a8a37ac1-82e2-46cb-92cc-316f0af9f693))
-  (fp_line (start -6.25 -0.5) (end -6.25 0) (layer "F.Fab") (width 0.1) (tstamp ac77d046-109b-4367-9cd7-e3508e5a53db))
-  (fp_line (start -10.75 -0.5) (end -10.75 0) (layer "F.Fab") (width 0.1) (tstamp ae1a476e-0948-42ea-a717-af773ab5dda4))
-  (fp_line (start 3.25 -0.5) (end 2.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp b152abb0-4495-4034-8ed9-34e8c64be63d))
-  (fp_line (start 0.25 0) (end 0.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp b2952184-48ca-4266-9291-3c74a0d1d9a9))
-  (fp_line (start 10.25 0) (end 10.75 0) (layer "F.Fab") (width 0.1) (tstamp b464ff83-1051-40ff-a560-b01c39951151))
-  (fp_line (start -3.25 -0.5) (end -3.25 0) (layer "F.Fab") (width 0.1) (tstamp ba6d4808-2560-4de3-8081-cbd2ff268e43))
-  (fp_line (start -8.75 0) (end -8.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp c2b34d67-a6a4-44d3-b482-b9b2998877fa))
-  (fp_line (start -7.25 0) (end -7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp c5ecd5b7-35f7-405f-8980-c91820342dc4))
-  (fp_line (start -5.75 -0.5) (end -6.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp c61fa494-6c1c-4fa2-a589-d573355363bb))
-  (fp_line (start -4.75 -0.5) (end -4.75 0) (layer "F.Fab") (width 0.1) (tstamp c8b9b725-8dd5-4e96-bfb3-0801e7fa301b))
-  (fp_line (start -0.25 -0.5) (end -0.25 0) (layer "F.Fab") (width 0.1) (tstamp cb082632-cbc2-4740-9f4c-7e8684abda9d))
-  (fp_line (start 3.25 0) (end 3.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp cd4f8792-13e7-47de-82e6-a67546338329))
-  (fp_line (start -13.5 2.25) (end 13.5 2.25) (layer "F.Fab") (width 0.1) (tstamp d125c0dd-3883-41ec-ae29-4f227314d3e3))
-  (fp_line (start 4.75 0) (end 4.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp d1d9830b-eb82-4741-a0c6-0803d1318140))
-  (fp_line (start 7.75 -0.5) (end 7.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp d4fbe307-adb8-4994-9662-5ca0724ec3cf))
-  (fp_line (start -11 2.25) (end -10.5 1.542893) (layer "F.Fab") (width 0.1) (tstamp d68c1df1-bf85-49f6-b52a-b23503f60c66))
-  (fp_line (start 4.25 0) (end 4.75 0) (layer "F.Fab") (width 0.1) (tstamp d70c9751-99a7-4183-a8be-60c8e9675987))
-  (fp_line (start 10.25 -0.5) (end 10.25 0) (layer "F.Fab") (width 0.1) (tstamp d765e5d2-38c3-4324-8218-934f252209a4))
-  (fp_line (start -1.25 0) (end -1.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp dec568e3-d25e-4b8b-9257-23e7fc8332aa))
-  (fp_line (start 9.25 0) (end 9.25 -0.5) (layer "F.Fab") (width 0.1) (tstamp e3983eb6-8319-4e61-af45-8baa2090fda3))
-  (fp_line (start 7.25 -0.5) (end 7.25 0) (layer "F.Fab") (width 0.1) (tstamp e77b3994-88ac-4697-9a18-7bd4ea6237fc))
-  (fp_line (start -9.25 0) (end -8.75 0) (layer "F.Fab") (width 0.1) (tstamp e95acbf9-5537-4a74-8cf2-40285e9b4b39))
-  (fp_line (start 7.75 0) (end 7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp eb36a2d8-b20b-4137-b5cb-ac73f3ad7913))
-  (fp_line (start -7.25 -0.5) (end -7.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp f299881e-3af1-4c27-b2a0-b5dee1126973))
-  (fp_line (start -1.75 -0.5) (end -1.75 0) (layer "F.Fab") (width 0.1) (tstamp f4b2b304-bc34-4f46-bcaa-ff8514bcebf1))
-  (fp_line (start 9.25 -0.5) (end 8.75 -0.5) (layer "F.Fab") (width 0.1) (tstamp fe6bc203-f99b-44b1-a6b4-7cde2a738e75))
-  (pad "1" smd roundrect (at -10.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1d75212e-0081-4dea-8abc-bd05af852ace))
-  (pad "2" smd roundrect (at -9 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f86163b6-9f06-4d2e-810c-ac1d96a411c3))
-  (pad "3" smd roundrect (at -7.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c2e63363-4aad-4229-96aa-828918f18bf1))
-  (pad "4" smd roundrect (at -6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 411fc17f-33a5-4f95-8dc0-bd90c522a5cd))
-  (pad "5" smd roundrect (at -4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ca1fa784-f779-4f7f-98c0-9445f644dddb))
-  (pad "6" smd roundrect (at -3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9cf8f167-39ea-4a6e-82cd-4060901f0ce0))
-  (pad "7" smd roundrect (at -1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc27cd0e-f0ad-47a4-ba7d-2cb27e17d356))
-  (pad "8" smd roundrect (at 0 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e08b3ed8-09f3-4a87-9b88-19eed9f51920))
-  (pad "9" smd roundrect (at 1.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d33e87bf-ba32-4c13-9d9a-488386967da2))
-  (pad "10" smd roundrect (at 3 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f939e24c-e615-4c4e-9eeb-729fa03c87d6))
-  (pad "11" smd roundrect (at 4.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5cc10d9b-6eb0-467c-b748-a3ac12d53a10))
-  (pad "12" smd roundrect (at 6 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ef47a5f7-783a-4131-a1cd-6ec979d98c8e))
-  (pad "13" smd roundrect (at 7.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ccc003a6-d6c8-4989-8725-8cd48d405e20))
-  (pad "14" smd roundrect (at 9 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c228724-4c02-4b76-ba99-f59153167fb7))
-  (pad "15" smd roundrect (at 10.5 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1e01cfba-c216-4760-a1c9-cb8511a3c2c8))
-  (pad "MP" smd roundrect (at -13.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 9a95ee72-593c-4a9d-8e7d-022f653b19f6))
-  (pad "MP" smd roundrect (at 13.1 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e5139a93-03ab-453d-a5be-6724a9c458b7))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM15B-ZESS-TBT_1x15-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical.kicad_mod b/Connector_JST.pretty/JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical.kicad_mod
index c00696529..43bf5a50d 100644
--- a/Connector_JST.pretty/JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical.kicad_mod
@@ -1,120 +1,196 @@
-(footprint "JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, BM16B-ZESS-TBT (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE vertical")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.15) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.15) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e7cf036e-63e7-4d6f-b2b0-5547108cdb93)
   )
-  (fp_text value "JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical" (at 0 5.15) (layer "F.Fab")
+  (fp_text value JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical (at 0 5.15) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp fac450fa-63d4-4f2e-8c98-3f50aa5879a1)
   )
-  (fp_text user "${REFERENCE}" (at 0 -1.5) (layer "F.Fab")
+  (fp_line (start -14.25 2.25) (end 14.25 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.36 -0.39) (end -14.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.36 2.36) (end -11.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.91 2.36) (end -11.91 3.95)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.36 -0.39) (end 14.36 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.36 2.36) (end 11.91 2.36)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.69 -3.66) (end 12.69 -3.66)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.25 -3.55) (end 14.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.25 2.25) (end -14.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.25 2.25) (end 14.25 -3.55)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.5 -0.5) (end -11.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.5 0) (end -11 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11 0) (end -11 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11 -0.5) (end -11.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 -0.5) (end -10 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 0) (end -9.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.5 0) (end -9.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.5 -0.5) (end -10 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -0.5) (end -8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 0) (end -8 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 0) (end -8 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8 -0.5) (end -8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -0.5) (end -7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 0) (end -6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 0) (end -6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.5 -0.5) (end -7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -0.5) (end -5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 0) (end -5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 0) (end -5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5 -0.5) (end -5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 -0.5) (end -4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4 0) (end -3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 0) (end -3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.5 -0.5) (end -4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 -0.5) (end -2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.5 0) (end -2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 0) (end -2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2 -0.5) (end -2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 -0.5) (end -1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1 0) (end -0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 0) (end -0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.5 -0.5) (end -1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 -0.5) (end 0.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 0.5 0) (end 1 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 0) (end 1 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 1 -0.5) (end 0.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 -0.5) (end 2 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2 0) (end 2.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 0) (end 2.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 2.5 -0.5) (end 2 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 -0.5) (end 3.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.5 0) (end 4 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 0) (end 4 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4 -0.5) (end 3.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 -0.5) (end 5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5 0) (end 5.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 0) (end 5.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.5 -0.5) (end 5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 -0.5) (end 6.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.5 0) (end 7 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 0) (end 7 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7 -0.5) (end 6.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 -0.5) (end 8 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8 0) (end 8.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 0) (end 8.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.5 -0.5) (end 8 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.5 -0.5) (end 9.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.5 0) (end 10 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10 0) (end 10 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10 -0.5) (end 9.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11 -0.5) (end 11 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11 0) (end 11.5 0)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.5 0) (end 11.5 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.5 -0.5) (end 11 -0.5)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.25 -4.45) (end -15.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -15.25 4.45) (end 15.25 4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.25 4.45) (end 15.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.25 -4.45) (end -15.25 -4.45)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.75 2.25) (end -11.25 1.542893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 1.542893) (end -10.75 2.25)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -11.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -9.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -8.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 8.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 9.75 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 11.25 2.75) (size 0.8 2.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -13.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 13.85 -2.3) (size 1.8 3.3) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 81202560-e231-46e8-a061-e5f950725352)
   )
-  (fp_line (start -14.36 2.36) (end -11.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp 0c9be58f-07cc-4ed0-bcfb-63685af307c7))
-  (fp_line (start -12.69 -3.66) (end 12.69 -3.66) (layer "F.SilkS") (width 0.12) (tstamp 201f19ed-a7b7-4cf4-8a81-cace257ec929))
-  (fp_line (start 14.36 2.36) (end 11.91 2.36) (layer "F.SilkS") (width 0.12) (tstamp 6ef5cea8-e4b9-49fa-b199-4c901c39b7a5))
-  (fp_line (start -14.36 -0.39) (end -14.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp a7330da3-217a-4f20-bc72-8339bdadf3a8))
-  (fp_line (start 14.36 -0.39) (end 14.36 2.36) (layer "F.SilkS") (width 0.12) (tstamp df6ad369-4afc-476e-b2df-2f41348dc577))
-  (fp_line (start -11.91 2.36) (end -11.91 3.95) (layer "F.SilkS") (width 0.12) (tstamp f469d227-5302-4e97-a578-1a450d9e1153))
-  (fp_line (start 15.25 4.45) (end 15.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 18180ed6-0757-408f-92e5-62dad046ffc9))
-  (fp_line (start -15.25 -4.45) (end -15.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 25d15811-845a-4f12-aaf0-54f814a88e5e))
-  (fp_line (start -15.25 4.45) (end 15.25 4.45) (layer "F.CrtYd") (width 0.05) (tstamp 7978f729-09e8-4914-8362-7f9204cb21ba))
-  (fp_line (start 15.25 -4.45) (end -15.25 -4.45) (layer "F.CrtYd") (width 0.05) (tstamp 7f64f8c8-975e-4033-94fa-a5eb659a7dd3))
-  (fp_line (start -0.5 -0.5) (end -1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 04b06ea9-ee4d-4d31-aae6-eeab494ad468))
-  (fp_line (start -5 -0.5) (end -5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 051ba7ca-3c65-4819-adf1-3a24a07f653c))
-  (fp_line (start -11.5 -0.5) (end -11.5 0) (layer "F.Fab") (width 0.1) (tstamp 07d1613c-b304-4b19-885c-7f1fc54d0e10))
-  (fp_line (start 1 0) (end 1 -0.5) (layer "F.Fab") (width 0.1) (tstamp 09fab462-86cc-47c0-90fc-377e69dea9df))
-  (fp_line (start -14.25 -3.55) (end 14.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp 116e103c-c3fb-4cc3-86f0-85c2df6ea9d2))
-  (fp_line (start 5 -0.5) (end 5 0) (layer "F.Fab") (width 0.1) (tstamp 145d546f-63e5-406a-979d-30809b5f1d7a))
-  (fp_line (start 6.5 -0.5) (end 6.5 0) (layer "F.Fab") (width 0.1) (tstamp 166f5915-20bd-4aa2-a328-5397f8a0954f))
-  (fp_line (start -7 0) (end -6.5 0) (layer "F.Fab") (width 0.1) (tstamp 1eb4afe3-b065-46ed-af25-3a1fa13eb8e2))
-  (fp_line (start -0.5 0) (end -0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 24586f4b-91a7-4ed1-a020-7641c1255e7f))
-  (fp_line (start 3.5 -0.5) (end 3.5 0) (layer "F.Fab") (width 0.1) (tstamp 2b005ace-6dcd-4984-87c7-c39a86d6d8c5))
-  (fp_line (start -10 0) (end -9.5 0) (layer "F.Fab") (width 0.1) (tstamp 2b59a56b-80a2-4537-b4db-add60dc72e85))
-  (fp_line (start 2 0) (end 2.5 0) (layer "F.Fab") (width 0.1) (tstamp 2d0baa3e-acb7-40bb-a1a1-9168d31090fb))
-  (fp_line (start -4 -0.5) (end -4 0) (layer "F.Fab") (width 0.1) (tstamp 2e7ccf67-6872-41f1-9bc6-2289f2c3ac77))
-  (fp_line (start -8 0) (end -8 -0.5) (layer "F.Fab") (width 0.1) (tstamp 2f2b2219-0d86-428d-a173-039577ae2653))
-  (fp_line (start -2 -0.5) (end -2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 302ae827-8a2f-4776-8478-1b382165448e))
-  (fp_line (start -6.5 -0.5) (end -7 -0.5) (layer "F.Fab") (width 0.1) (tstamp 3376b1d3-ded7-441a-9537-8cd9a71b8fbc))
-  (fp_line (start -11.25 1.542893) (end -10.75 2.25) (layer "F.Fab") (width 0.1) (tstamp 382559f7-ed14-4cfd-b9e8-a0cb1c641dbe))
-  (fp_line (start -14.25 2.25) (end -14.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp 3896a2b0-947f-4cfa-92b5-6e4b56cc844a))
-  (fp_line (start -11 0) (end -11 -0.5) (layer "F.Fab") (width 0.1) (tstamp 442407e5-f501-485b-9ffc-dcc744ae7888))
-  (fp_line (start 10 0) (end 10 -0.5) (layer "F.Fab") (width 0.1) (tstamp 49288637-cab2-4638-99ae-ef773f2253b2))
-  (fp_line (start -11.5 0) (end -11 0) (layer "F.Fab") (width 0.1) (tstamp 4bb601f8-92b9-4c5f-b381-f192357d0153))
-  (fp_line (start 3.5 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp 4d1ac906-ddee-4414-8c39-e52d7f70f207))
-  (fp_line (start 8.5 -0.5) (end 8 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5274b9bb-f51e-4509-9638-cffd7795a03f))
-  (fp_line (start -2 0) (end -2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 54591a8a-4bbb-4d3d-b08f-5bc2b697f663))
-  (fp_line (start -5.5 0) (end -5 0) (layer "F.Fab") (width 0.1) (tstamp 5469c363-1dbb-41b1-8969-b58097e653ab))
-  (fp_line (start -11 -0.5) (end -11.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 5fdac1bf-767f-4951-9b20-bbcad1f6977d))
-  (fp_line (start 0.5 -0.5) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp 62907196-0f18-471c-90f5-9a0eebb629f3))
-  (fp_line (start -2.5 -0.5) (end -2.5 0) (layer "F.Fab") (width 0.1) (tstamp 64fbdaee-56a7-4027-8b2b-30e2a837ccfb))
-  (fp_line (start 9.5 -0.5) (end 9.5 0) (layer "F.Fab") (width 0.1) (tstamp 654ee9b7-6e22-4c20-836a-8b9646af489f))
-  (fp_line (start 7 0) (end 7 -0.5) (layer "F.Fab") (width 0.1) (tstamp 6e47eaee-89ab-4169-a595-3cd346432db5))
-  (fp_line (start -9.5 0) (end -9.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 729eb555-454b-4bfd-8362-9bbd4aefd0b0))
-  (fp_line (start -8.5 0) (end -8 0) (layer "F.Fab") (width 0.1) (tstamp 84200863-c3f8-45fe-9a19-9c696ef89d72))
-  (fp_line (start -3.5 -0.5) (end -4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 88a931c6-8bda-4961-b2f1-56df24e2fbb9))
-  (fp_line (start 4 0) (end 4 -0.5) (layer "F.Fab") (width 0.1) (tstamp 89fb0780-3286-4bca-8242-3bc7744a38eb))
-  (fp_line (start 2.5 -0.5) (end 2 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8c1c94f1-d165-4b3a-94c4-380968ee81f3))
-  (fp_line (start 1 -0.5) (end 0.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 8c3189ea-9fae-4a66-8878-28d3e7e5d07e))
-  (fp_line (start 11 -0.5) (end 11 0) (layer "F.Fab") (width 0.1) (tstamp 8cd47d75-8899-442e-a437-4fc0c7a16617))
-  (fp_line (start -1 0) (end -0.5 0) (layer "F.Fab") (width 0.1) (tstamp 93a16802-f5bd-4597-aebe-d1da75ded000))
-  (fp_line (start -2.5 0) (end -2 0) (layer "F.Fab") (width 0.1) (tstamp 94865e3c-0867-4c1c-865a-b7e946f03c8c))
-  (fp_line (start 10 -0.5) (end 9.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp 9b9e9e9e-8bd3-4963-b430-ea6f0b983bb7))
-  (fp_line (start -4 0) (end -3.5 0) (layer "F.Fab") (width 0.1) (tstamp 9f85809f-4d10-4182-954c-aeb0a2924c49))
-  (fp_line (start -5.5 -0.5) (end -5.5 0) (layer "F.Fab") (width 0.1) (tstamp a1f2ab14-6d89-450c-85b0-11003bec2a2f))
-  (fp_line (start 11 0) (end 11.5 0) (layer "F.Fab") (width 0.1) (tstamp aad51510-e470-4f58-be09-0e3adb2edf31))
-  (fp_line (start -14.25 2.25) (end 14.25 2.25) (layer "F.Fab") (width 0.1) (tstamp b2a5a515-90f6-46de-80b0-c397e0de7083))
-  (fp_line (start -1 -0.5) (end -1 0) (layer "F.Fab") (width 0.1) (tstamp b580504b-b26e-4198-b74a-e4181ac33805))
-  (fp_line (start 11.5 -0.5) (end 11 -0.5) (layer "F.Fab") (width 0.1) (tstamp b6bb62a3-9a58-4d8f-8dc3-9fb34de75e7c))
-  (fp_line (start 2 -0.5) (end 2 0) (layer "F.Fab") (width 0.1) (tstamp c1cce62a-d74a-404b-8ab5-fac78a832ea7))
-  (fp_line (start -5 0) (end -5 -0.5) (layer "F.Fab") (width 0.1) (tstamp c35790f7-7be9-471a-b22f-0ab84a1f0bca))
-  (fp_line (start 6.5 0) (end 7 0) (layer "F.Fab") (width 0.1) (tstamp c5e12ff2-c477-4edf-8343-1e7b0fc257b9))
-  (fp_line (start 5.5 0) (end 5.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp c63d6f51-f8b3-45ea-913f-dbd4a758cb45))
-  (fp_line (start -10 -0.5) (end -10 0) (layer "F.Fab") (width 0.1) (tstamp c674f742-9319-4bd8-8428-831f535520d0))
-  (fp_line (start 8 0) (end 8.5 0) (layer "F.Fab") (width 0.1) (tstamp c79c9582-d36d-4708-bd4c-45b25412261b))
-  (fp_line (start 8 -0.5) (end 8 0) (layer "F.Fab") (width 0.1) (tstamp ccf5459c-ee2a-4cf5-ad81-0f74ef6a424d))
-  (fp_line (start 2.5 0) (end 2.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp cf77044a-513e-41c5-bc66-4cad9dbaa89d))
-  (fp_line (start -8 -0.5) (end -8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp d059b6f4-78bc-4676-9b96-f0efed1f6770))
-  (fp_line (start -3.5 0) (end -3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp d243f4dc-031d-47c3-a396-7e0376eaa73e))
-  (fp_line (start 5.5 -0.5) (end 5 -0.5) (layer "F.Fab") (width 0.1) (tstamp d47d3e45-f782-4737-bf45-e71ad30cbfbf))
-  (fp_line (start -9.5 -0.5) (end -10 -0.5) (layer "F.Fab") (width 0.1) (tstamp d534ee22-dd36-4433-9483-e10f0bbe3201))
-  (fp_line (start -6.5 0) (end -6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp da707c1d-ca45-45f4-9037-b7d2aa47d433))
-  (fp_line (start 9.5 0) (end 10 0) (layer "F.Fab") (width 0.1) (tstamp de102275-25f7-40be-a7df-cf395cdd13de))
-  (fp_line (start 11.5 0) (end 11.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e1d35247-52f7-4ffc-bdc0-7b3f7b3330cf))
-  (fp_line (start 5 0) (end 5.5 0) (layer "F.Fab") (width 0.1) (tstamp e23f65e5-9483-4a75-8c7b-4671c7fa81b9))
-  (fp_line (start 7 -0.5) (end 6.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp e3758765-05e0-4314-9efb-605ef64c5ea5))
-  (fp_line (start 0.5 0) (end 1 0) (layer "F.Fab") (width 0.1) (tstamp e90fea76-f1e6-4673-bc25-2ba08391ccdb))
-  (fp_line (start 8.5 0) (end 8.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp ec4136b9-57d5-454f-9c39-9ecf10e8f3cd))
-  (fp_line (start -7 -0.5) (end -7 0) (layer "F.Fab") (width 0.1) (tstamp f5218ab4-c5c3-4b9e-b015-12c138039376))
-  (fp_line (start -8.5 -0.5) (end -8.5 0) (layer "F.Fab") (width 0.1) (tstamp f7fff28d-4b68-4f7a-bdc6-fdab66fa8350))
-  (fp_line (start -11.75 2.25) (end -11.25 1.542893) (layer "F.Fab") (width 0.1) (tstamp f8344ff4-6100-4aa3-8536-67047e06be1c))
-  (fp_line (start 14.25 2.25) (end 14.25 -3.55) (layer "F.Fab") (width 0.1) (tstamp fa20c95f-325c-42af-8980-07e4a1cd9fcb))
-  (fp_line (start 4 -0.5) (end 3.5 -0.5) (layer "F.Fab") (width 0.1) (tstamp feffd117-8212-47ad-8345-e3fdd9047f9a))
-  (pad "1" smd roundrect (at -11.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 69a031d4-3779-46df-b5d0-e8a2568f8bf6))
-  (pad "2" smd roundrect (at -9.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3180eb41-60dc-47f0-aff3-e1a4e6b17fac))
-  (pad "3" smd roundrect (at -8.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e381ecd9-f65d-46c6-9010-27cd65432031))
-  (pad "4" smd roundrect (at -6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f1df24a0-f757-4f3e-ac9d-35e68cd98908))
-  (pad "5" smd roundrect (at -5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b660566f-69d6-4d74-b42a-eb64d3978fdf))
-  (pad "6" smd roundrect (at -3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 96d37819-c046-497a-bc72-46762dff4a17))
-  (pad "7" smd roundrect (at -2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 48c80117-28e1-4f79-a1b1-63faaefbaaf5))
-  (pad "8" smd roundrect (at -0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3bcf8346-1ed7-410d-94cf-5e16b1016a91))
-  (pad "9" smd roundrect (at 0.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4fafe9bb-4bf3-4945-9893-2ed7f697c9b7))
-  (pad "10" smd roundrect (at 2.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f7629595-d78f-417a-8977-c849494ef1a3))
-  (pad "11" smd roundrect (at 3.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 088af3fd-d538-4e62-a6b4-8eb579d8cf58))
-  (pad "12" smd roundrect (at 5.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7b3c2842-1e33-4c0c-ae65-ac2eb6964a44))
-  (pad "13" smd roundrect (at 6.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d9ad0584-59d4-46fc-a189-623a7bdfad47))
-  (pad "14" smd roundrect (at 8.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8de78e3f-12bf-4e3a-b2fd-4124de1b52f0))
-  (pad "15" smd roundrect (at 9.75 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0de95a73-2a4d-4ca7-b936-7ede84208389))
-  (pad "16" smd roundrect (at 11.25 2.75) (size 0.8 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 593248b2-e9ea-4bf3-b2d1-5bd0c3c32124))
-  (pad "MP" smd roundrect (at -13.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e9aba003-a5d0-494e-9524-ac89e0e4bdf7))
-  (pad "MP" smd roundrect (at 13.85 -2.3) (size 1.8 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp f4de96bf-203c-4ef0-a1ed-0b0ff9a4c359))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_BM16B-ZESS-TBT_1x16-1MP_P1.50mm_Vertical.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal.kicad_mod
index e7939733d..d633f994c 100644
--- a/Connector_JST.pretty/JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,44 +1,58 @@
-(footprint "JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM02B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 56170ba2-e69f-4723-9307-807d4f67eabb)
   )
-  (fp_text value "JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9de58132-4305-4842-b348-8a8b7556d78a)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -3.75 -2.025) (end 3.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.86 -0.035) (end -3.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.86 -2.135) (end -1.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -1.41 -2.135) (end -1.41 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.86 -0.035) (end 3.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.86 -2.135) (end 1.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.86 4.285) (end -3.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.86 5.585) (end 3.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 3.86 5.585) (end 3.86 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.75 5.475) (end 3.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -2.025) (end -3.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 3.75 -2.025) (end 3.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.75 -4.52) (end -4.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.75 5.98) (end 4.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.75 5.98) (end 4.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 4.75 -4.52) (end -4.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -1.25 -2.025) (end -0.75 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -0.75 -1.317893) (end -0.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -3.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 3.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 34f7c5a8-d6a1-44a5-ae60-219d2cb2fb79)
   )
-  (fp_line (start -3.86 -0.035) (end -3.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 2f51a8c9-d019-43c0-97a0-1468d47d6819))
-  (fp_line (start -3.86 4.285) (end -3.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp 724a12e8-2d4b-4623-966b-3ac00471b802))
-  (fp_line (start 3.86 -2.135) (end 1.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 79b4fb50-2968-4c9d-a557-716f943164c9))
-  (fp_line (start 3.86 -0.035) (end 3.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 8709d007-f236-416a-a3b6-7a8a09e1bf96))
-  (fp_line (start -3.86 -2.135) (end -1.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 88b1bb80-d7b7-4265-8089-148a6b9bd06e))
-  (fp_line (start 3.86 5.585) (end 3.86 4.285) (layer "F.SilkS") (width 0.12) (tstamp a040d5c8-4419-4968-b3ca-8e77bbd0e147))
-  (fp_line (start -1.41 -2.135) (end -1.41 -4.025) (layer "F.SilkS") (width 0.12) (tstamp b09a370f-6a09-4afc-99c9-5329e7d8309d))
-  (fp_line (start -3.86 5.585) (end 3.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp e5c418ef-34cd-44f5-9f7f-3bbfa7052cd7))
-  (fp_line (start 4.75 -4.52) (end -4.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 36b10b5a-aa77-4494-b2c3-5a1a4819754d))
-  (fp_line (start -4.75 -4.52) (end -4.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp d4c468db-82cc-4a47-9ddd-4bd070f2de87))
-  (fp_line (start -4.75 5.98) (end 4.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp df2d5e1c-cfcb-47d1-9d47-0ee854a6ecd6))
-  (fp_line (start 4.75 5.98) (end 4.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp f5e0d8e4-2184-4203-89d3-315d540cbdcb))
-  (fp_line (start -3.75 -2.025) (end 3.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 1e9db5eb-96b5-4f94-a86a-95bd4ab85bf3))
-  (fp_line (start -0.75 -1.317893) (end -0.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp 4d464690-8b51-439b-829b-575c42afe8a5))
-  (fp_line (start -3.75 5.475) (end 3.75 5.475) (layer "F.Fab") (width 0.1) (tstamp a6f4afc6-6a22-48ca-a8c8-8b005104735e))
-  (fp_line (start 3.75 -2.025) (end 3.75 5.475) (layer "F.Fab") (width 0.1) (tstamp b18c90c8-24e7-4c61-b342-8f25fec33d6b))
-  (fp_line (start -1.25 -2.025) (end -0.75 -1.317893) (layer "F.Fab") (width 0.1) (tstamp e0ce995b-596d-4fc6-ab6b-8b91e1633512))
-  (fp_line (start -3.75 -2.025) (end -3.75 5.475) (layer "F.Fab") (width 0.1) (tstamp f368b30b-a849-44e5-95dd-e5954d00a950))
-  (pad "1" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9f957abc-13e8-4ce2-a398-c8edbf862109))
-  (pad "2" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 129caac5-0c81-4712-a878-4ab95dd3f51e))
-  (pad "MP" smd roundrect (at 3.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 4e2c3970-de86-4c52-be78-b73f39e45736))
-  (pad "MP" smd roundrect (at -3.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp a376b60e-741d-428d-95d9-9bc5057ce0a3))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM02B-ZESS-TB_1x02-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal.kicad_mod
index add8d533f..48915f1c5 100644
--- a/Connector_JST.pretty/JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,45 +1,59 @@
-(footprint "JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM03B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cbca4c4b-3bf1-4df9-b5b8-def151e17820)
   )
-  (fp_text value "JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cc2ad605-0bb1-4d52-99b7-81f36a7c1190)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -4.5 -2.025) (end 4.5 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.61 -0.035) (end -4.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.61 -2.135) (end -2.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.16 -2.135) (end -2.16 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 -0.035) (end 4.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 -2.135) (end 2.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.61 4.285) (end -4.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.61 5.585) (end 4.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 4.61 5.585) (end 4.61 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.5 5.475) (end 4.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 -2.025) (end -4.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 4.5 -2.025) (end 4.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.5 -4.52) (end -5.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.5 5.98) (end 5.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.5 5.98) (end 5.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 5.5 -4.52) (end -5.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2 -2.025) (end -1.5 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -1.5 -1.317893) (end -1 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 4.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b5aed9a8-b682-4681-8ec0-3a19845fe4da)
   )
-  (fp_line (start 4.61 -2.135) (end 2.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 071ebc5f-f662-4e31-853d-1fc7b8772bd3))
-  (fp_line (start -2.16 -2.135) (end -2.16 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 1843fba6-56af-465f-b153-295f18d954a6))
-  (fp_line (start -4.61 4.285) (end -4.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp 1f517c01-1c39-4882-8d6f-f30d59662c66))
-  (fp_line (start -4.61 -0.035) (end -4.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 7ed92523-6301-470e-8b61-8141552e4d33))
-  (fp_line (start 4.61 -0.035) (end 4.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp b63e8b7a-3bfa-46a9-85ca-4da6d6a93a40))
-  (fp_line (start -4.61 5.585) (end 4.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp da5c7990-17c3-4ef5-bd6d-5c20053228c1))
-  (fp_line (start 4.61 5.585) (end 4.61 4.285) (layer "F.SilkS") (width 0.12) (tstamp e2f35e81-00e2-493f-8a34-e0e4c379dd70))
-  (fp_line (start -4.61 -2.135) (end -2.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp e7cd8055-fcef-4489-a35d-de551abf3897))
-  (fp_line (start -5.5 -4.52) (end -5.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 449b3f6e-8e80-4364-8a62-2cc10418cc14))
-  (fp_line (start 5.5 -4.52) (end -5.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 8aa225cf-90e5-4ee8-bcee-e3ad189b3638))
-  (fp_line (start 5.5 5.98) (end 5.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp a02dca66-6b48-40c1-8e54-e7378d714685))
-  (fp_line (start -5.5 5.98) (end 5.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp e4a4325d-1531-47fa-b327-2026b59a019d))
-  (fp_line (start -4.5 -2.025) (end -4.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 24100ce2-c5b9-4fbd-b7a2-e293f268525e))
-  (fp_line (start -4.5 -2.025) (end 4.5 -2.025) (layer "F.Fab") (width 0.1) (tstamp 6ba11021-1f4d-45c3-bd55-95b0eb4fc2a3))
-  (fp_line (start 4.5 -2.025) (end 4.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 901c1cf1-31dc-4954-96ae-a46178261d20))
-  (fp_line (start -4.5 5.475) (end 4.5 5.475) (layer "F.Fab") (width 0.1) (tstamp a1ecaf4e-0c10-415e-bcb3-6267700a2376))
-  (fp_line (start -1.5 -1.317893) (end -1 -2.025) (layer "F.Fab") (width 0.1) (tstamp dcc6146e-67a4-4da2-b782-34bf55ce48c0))
-  (fp_line (start -2 -2.025) (end -1.5 -1.317893) (layer "F.Fab") (width 0.1) (tstamp f020c5e6-ec35-4294-82da-6e9380147753))
-  (pad "1" smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00dcf094-f926-4c44-8513-8476320130c8))
-  (pad "2" smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f2c52eb-546b-4fd6-8933-2871e28c10e2))
-  (pad "3" smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6f88e0e1-b31f-4ea2-b480-80dccea66b49))
-  (pad "MP" smd roundrect (at -4.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 2edac108-e994-4eb8-b12f-feaa28479d59))
-  (pad "MP" smd roundrect (at 4.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e2b59c7e-84b1-4c6e-8c05-9b348d9128d6))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM03B-ZESS-TB_1x03-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal.kicad_mod
index d06f18e1e..885c7e1a4 100644
--- a/Connector_JST.pretty/JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,46 +1,60 @@
-(footprint "JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM04B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2e9393bf-85d3-4704-82f7-084c6e9189c9)
   )
-  (fp_text value "JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6c7cfe6e-6692-49e0-8448-f93abdfeb5dd)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -5.25 -2.025) (end 5.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.36 -0.035) (end -5.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.36 -2.135) (end -2.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -2.91 -2.135) (end -2.91 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.36 -0.035) (end 5.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.36 -2.135) (end 2.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.36 4.285) (end -5.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.36 5.585) (end 5.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 5.36 5.585) (end 5.36 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.25 5.475) (end 5.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -2.025) (end -5.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 5.25 -2.025) (end 5.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.25 -4.52) (end -6.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.25 5.98) (end 6.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.25 5.98) (end 6.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 6.25 -4.52) (end -6.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -2.75 -2.025) (end -2.25 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -2.25 -1.317893) (end -1.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -4.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 4.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0728da7e-fbcd-4309-b520-fa86f44ce387)
   )
-  (fp_line (start 5.36 -0.035) (end 5.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 00120f51-7e3c-4029-9a64-12c79708ffb6))
-  (fp_line (start -5.36 -0.035) (end -5.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 3a4d8f62-a698-4546-90e9-d848b8b092f8))
-  (fp_line (start -5.36 5.585) (end 5.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp 3e2f8c63-5ff4-4381-9354-cb51e9c0368a))
-  (fp_line (start 5.36 -2.135) (end 2.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 433bb267-4edf-45de-ae2a-63bb93053c0e))
-  (fp_line (start -5.36 -2.135) (end -2.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 92ebb2c3-1e19-4047-8339-f786d7a3369a))
-  (fp_line (start -2.91 -2.135) (end -2.91 -4.025) (layer "F.SilkS") (width 0.12) (tstamp a89ba17a-dd47-475f-983f-f11984507648))
-  (fp_line (start 5.36 5.585) (end 5.36 4.285) (layer "F.SilkS") (width 0.12) (tstamp acf520c3-3ea6-44f1-895d-5a1dfc985422))
-  (fp_line (start -5.36 4.285) (end -5.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp dd7fa8bc-ad13-4f66-88bb-bef5588c8112))
-  (fp_line (start 6.25 5.98) (end 6.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 82223d35-7779-427e-a65c-968ea6fcdc6a))
-  (fp_line (start 6.25 -4.52) (end -6.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 9261bebe-351d-4718-a6cd-ec052736ba90))
-  (fp_line (start -6.25 5.98) (end 6.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp a9c91da5-87b3-4f2c-b63c-759c13ea307d))
-  (fp_line (start -6.25 -4.52) (end -6.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp ea8bcb0a-4f1f-4202-8167-bbadaf83c19e))
-  (fp_line (start -2.75 -2.025) (end -2.25 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 0ff0992c-3317-415a-b376-4c3394f55a15))
-  (fp_line (start 5.25 -2.025) (end 5.25 5.475) (layer "F.Fab") (width 0.1) (tstamp 13333764-c907-49e2-ba86-f7f37fc532a1))
-  (fp_line (start -5.25 5.475) (end 5.25 5.475) (layer "F.Fab") (width 0.1) (tstamp 215bb6e7-613e-4dad-b630-20e07c55c607))
-  (fp_line (start -2.25 -1.317893) (end -1.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 83608d02-f1b5-40bb-8ea4-8190a207d95a))
-  (fp_line (start -5.25 -2.025) (end -5.25 5.475) (layer "F.Fab") (width 0.1) (tstamp def7e793-6a82-41da-ab5f-0fa57df77a94))
-  (fp_line (start -5.25 -2.025) (end 5.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp fa8c084f-6fd5-4c27-a961-44edb64d0145))
-  (pad "1" smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f9b5e591-1ce8-4910-843e-d59750216e55))
-  (pad "2" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 11dd2319-cb23-4c8b-9488-6482340487d6))
-  (pad "3" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f53275ff-a571-4e2e-93aa-47f6b8b82528))
-  (pad "4" smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 72cabe8f-be38-4c1d-9084-7e8ea758cf0c))
-  (pad "MP" smd roundrect (at 4.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 2d840c8d-19b0-4c6d-94d9-bed08f0050ab))
-  (pad "MP" smd roundrect (at -4.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 8bfe6821-de28-43c5-b1e8-096879ec0ef5))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM04B-ZESS-TB_1x04-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal.kicad_mod
index fbad8cf89..2286f2420 100644
--- a/Connector_JST.pretty/JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,47 +1,61 @@
-(footprint "JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM05B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2c5d3672-6ebe-40f9-aeee-03f7e65cb480)
   )
-  (fp_text value "JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 3aecea1c-a3e4-49b2-b583-01fadcba6b31)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -6 -2.025) (end 6 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.11 -0.035) (end -6.11 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 -2.135) (end -3.66 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -3.66 -2.135) (end -3.66 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 -0.035) (end 6.11 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 -2.135) (end 3.66 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 4.285) (end -6.11 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.11 5.585) (end 6.11 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.11 5.585) (end 6.11 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6 5.475) (end 6 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -2.025) (end -6 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6 -2.025) (end 6 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7 -4.52) (end -7 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7 5.98) (end 7 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7 5.98) (end 7 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7 -4.52) (end -7 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -3.5 -2.025) (end -3 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3 -1.317893) (end -2.5 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -5.6 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 5.6 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 687651da-aec8-450a-b464-062bf36945f8)
   )
-  (fp_line (start -6.11 -2.135) (end -3.66 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 3047f608-f345-4daf-912e-58849c5915d2))
-  (fp_line (start 6.11 -0.035) (end 6.11 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 4a47910f-b03f-4cd6-9b57-fd0616be2b18))
-  (fp_line (start -6.11 5.585) (end 6.11 5.585) (layer "F.SilkS") (width 0.12) (tstamp 4b4a889a-8f8d-4da6-826e-905789df4bc3))
-  (fp_line (start -6.11 4.285) (end -6.11 5.585) (layer "F.SilkS") (width 0.12) (tstamp 4d1f5af8-ae27-4bd1-b6b2-01eaf31078b3))
-  (fp_line (start 6.11 -2.135) (end 3.66 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 5066e3bc-64e4-4b98-87dc-56c5fc5ac7c7))
-  (fp_line (start -3.66 -2.135) (end -3.66 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 9395ba86-e610-4460-9f1f-6a298fd1d5ff))
-  (fp_line (start -6.11 -0.035) (end -6.11 -2.135) (layer "F.SilkS") (width 0.12) (tstamp c93d01a6-a8f4-4dac-9699-882d986e7f12))
-  (fp_line (start 6.11 5.585) (end 6.11 4.285) (layer "F.SilkS") (width 0.12) (tstamp cd1691cc-3c7f-41d0-8452-63287601617f))
-  (fp_line (start -7 -4.52) (end -7 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 2987900a-b5c6-4504-80e0-ffc45afab830))
-  (fp_line (start -7 5.98) (end 7 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 359f937b-38b5-4925-bb48-c630fd8c2291))
-  (fp_line (start 7 5.98) (end 7 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 39da9fd1-ee1e-434f-91b6-15abe5f9c78e))
-  (fp_line (start 7 -4.52) (end -7 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp c430fb34-6121-4da0-9c9e-3e84f9024da8))
-  (fp_line (start 6 -2.025) (end 6 5.475) (layer "F.Fab") (width 0.1) (tstamp 0d323c20-bc71-4938-8e3b-dc1f66cbada8))
-  (fp_line (start -3 -1.317893) (end -2.5 -2.025) (layer "F.Fab") (width 0.1) (tstamp 7f860108-4ffb-4c8c-963a-6800e979de6b))
-  (fp_line (start -6 -2.025) (end 6 -2.025) (layer "F.Fab") (width 0.1) (tstamp 87b9d725-651e-42b4-ab0d-131406cdf32d))
-  (fp_line (start -6 5.475) (end 6 5.475) (layer "F.Fab") (width 0.1) (tstamp 99739b45-76c8-4919-af7b-68fc62b055e2))
-  (fp_line (start -6 -2.025) (end -6 5.475) (layer "F.Fab") (width 0.1) (tstamp 9ae2b1ab-b0e2-43ff-bb7f-c1501cbf5e8c))
-  (fp_line (start -3.5 -2.025) (end -3 -1.317893) (layer "F.Fab") (width 0.1) (tstamp e9bc193f-cdbb-4ef0-a482-273b41277a6b))
-  (pad "1" smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 512cba45-339e-4b25-a574-1c2e49db0200))
-  (pad "2" smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d092e3e4-8d55-42a3-81c7-20504b712c25))
-  (pad "3" smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 21a27d02-4bce-4567-847f-a62e7ce745e3))
-  (pad "4" smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d26ad6cd-cba9-4022-8951-56dbdb3e0c0a))
-  (pad "5" smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 93f6cf9c-595e-4548-8a87-3c8b64ee9168))
-  (pad "MP" smd roundrect (at -5.6 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 4c8b8766-7e5c-4f24-92b3-e30f6163bf8a))
-  (pad "MP" smd roundrect (at 5.6 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 6b8a5b9b-d2f2-4160-9cbd-1c3c5fa08a9f))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM05B-ZESS-TB_1x05-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal.kicad_mod
index 8a4a262f3..6fe7c9838 100644
--- a/Connector_JST.pretty/JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,48 +1,62 @@
-(footprint "JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM06B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4c5611ac-cb8c-4c95-af6b-cee513136f77)
   )
-  (fp_text value "JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 15c8076a-a8a7-439e-b507-52ab516a2cf9)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -6.75 -2.025) (end 6.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.86 -0.035) (end -6.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.86 -2.135) (end -4.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -4.41 -2.135) (end -4.41 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.86 -0.035) (end 6.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.86 -2.135) (end 4.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.86 4.285) (end -6.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.86 5.585) (end 6.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 6.86 5.585) (end 6.86 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.75 5.475) (end 6.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -2.025) (end -6.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 6.75 -2.025) (end 6.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.75 -4.52) (end -7.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.75 5.98) (end 7.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.75 5.98) (end 7.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 7.75 -4.52) (end -7.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -4.25 -2.025) (end -3.75 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -3.75 -1.317893) (end -3.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -6.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 6.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1cacc965-5fc7-4f62-a599-800f72a0ac55)
   )
-  (fp_line (start -6.86 -0.035) (end -6.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 1f7f1c95-221c-4885-80f1-0533e952b824))
-  (fp_line (start -6.86 4.285) (end -6.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp 2984ce57-9d4d-414c-a676-7c872aba265d))
-  (fp_line (start -6.86 5.585) (end 6.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp 39dfeddf-e7d0-47bd-891a-8ce031fa4c0e))
-  (fp_line (start 6.86 -2.135) (end 4.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 54f96603-4cd6-4a14-9da7-18f6f4d23113))
-  (fp_line (start -4.41 -2.135) (end -4.41 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 6e535611-7e9f-4529-9d27-3fd8ff6983f9))
-  (fp_line (start 6.86 5.585) (end 6.86 4.285) (layer "F.SilkS") (width 0.12) (tstamp c2cf28d3-a94e-42f9-b804-52cd280d76ba))
-  (fp_line (start -6.86 -2.135) (end -4.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp df666192-c1b1-4f48-a233-1ddb0b996ef4))
-  (fp_line (start 6.86 -0.035) (end 6.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp f4a04f02-7c91-483f-adfd-652523b9a750))
-  (fp_line (start -7.75 5.98) (end 7.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 54290651-dc72-4afc-83a7-3a7d53836bba))
-  (fp_line (start 7.75 5.98) (end 7.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 8a6e85ac-7eea-4cdb-82b1-119686357aa5))
-  (fp_line (start -7.75 -4.52) (end -7.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 8be95681-cd8e-4bd4-99c6-5467bdd39575))
-  (fp_line (start 7.75 -4.52) (end -7.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp af4ec90a-11d5-4599-abf4-acb719c9bf5d))
-  (fp_line (start -6.75 -2.025) (end 6.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 06bf7047-9e6d-43f6-8240-248655c8642a))
-  (fp_line (start -3.75 -1.317893) (end -3.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp 13875fa9-7de9-4f5a-a7f6-ed786a4610f2))
-  (fp_line (start -6.75 -2.025) (end -6.75 5.475) (layer "F.Fab") (width 0.1) (tstamp 2310e504-c9d7-4e9b-be69-78eb7dca16c1))
-  (fp_line (start -4.25 -2.025) (end -3.75 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 24899971-ddc6-49e9-8275-3198097a9748))
-  (fp_line (start -6.75 5.475) (end 6.75 5.475) (layer "F.Fab") (width 0.1) (tstamp 6be0bbea-27d9-40b9-92a5-5c0b897824f0))
-  (fp_line (start 6.75 -2.025) (end 6.75 5.475) (layer "F.Fab") (width 0.1) (tstamp b78f86e0-2ce7-4ec7-af39-7a976671ea9c))
-  (pad "1" smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp edbc43cc-4eaf-4ec4-9e4c-027a56baeda9))
-  (pad "2" smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1913c13b-f73c-4268-8769-b730dcffa54c))
-  (pad "3" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3f07a859-72f6-4b0a-90a2-926c2dfef028))
-  (pad "4" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b327979b-df9b-47d8-a02f-d01af3c937a1))
-  (pad "5" smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e15303c4-171f-4e33-8400-c48209a1b253))
-  (pad "6" smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0bc3eb83-1a00-4e07-84ea-751834928caa))
-  (pad "MP" smd roundrect (at -6.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 70759fa3-5b79-4df7-a9fa-19c3f0a99b1c))
-  (pad "MP" smd roundrect (at 6.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp fe5d3605-51ab-405f-a277-9a9426cf5c73))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM06B-ZESS-TB_1x06-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal.kicad_mod
index 469183a20..e1989126a 100644
--- a/Connector_JST.pretty/JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,49 +1,63 @@
-(footprint "JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM07B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7104f0ef-da96-406e-b003-363c367ab1a0)
   )
-  (fp_text value "JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 473e215d-b911-4895-b787-81ca58a4b2a4)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -7.5 -2.025) (end 7.5 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.61 -0.035) (end -7.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 -2.135) (end -5.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.16 -2.135) (end -5.16 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 -0.035) (end 7.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 -2.135) (end 5.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 4.285) (end -7.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.61 5.585) (end 7.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 7.61 5.585) (end 7.61 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.5 5.475) (end 7.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 -2.025) (end -7.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 7.5 -2.025) (end 7.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.5 -4.52) (end -8.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.5 5.98) (end 8.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.5 5.98) (end 8.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 8.5 -4.52) (end -8.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5 -2.025) (end -4.5 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -4.5 -1.317893) (end -4 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 7.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 38c0bf9d-db25-4431-8351-48967129e519)
   )
-  (fp_line (start 7.61 -2.135) (end 5.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 08d26bc6-158a-4f37-bc27-8de57422b7a3))
-  (fp_line (start -7.61 5.585) (end 7.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp 48769029-89ed-4353-93b7-9778039dfb58))
-  (fp_line (start -7.61 -2.135) (end -5.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 73b72df1-489a-4b7c-af6a-64cfea048892))
-  (fp_line (start 7.61 -0.035) (end 7.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 76b6cb9e-98a9-4179-873a-2dd9614418fd))
-  (fp_line (start -5.16 -2.135) (end -5.16 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 97598555-5799-4586-88de-dce489b58235))
-  (fp_line (start 7.61 5.585) (end 7.61 4.285) (layer "F.SilkS") (width 0.12) (tstamp c04500c4-2416-4852-8aa3-936e41e21460))
-  (fp_line (start -7.61 -0.035) (end -7.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp e8f93d37-e7f3-48af-97b4-bf61f1a3d13c))
-  (fp_line (start -7.61 4.285) (end -7.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp fbab064d-18bd-4b8e-9ce3-3c3822dfcfb7))
-  (fp_line (start 8.5 5.98) (end 8.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 0f6d4e95-b5b7-40e0-a2eb-b13bae57bb49))
-  (fp_line (start 8.5 -4.52) (end -8.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 61937723-a0d0-44a9-afbe-545c6aa8a21e))
-  (fp_line (start -8.5 5.98) (end 8.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 9f5d12d5-d9a3-48a3-adfa-9e490b50b18f))
-  (fp_line (start -8.5 -4.52) (end -8.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp b32ae74f-4ef6-4d2c-8fa3-58fab867b7d6))
-  (fp_line (start -7.5 5.475) (end 7.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 00989f36-7341-45d8-8241-a81e05b26d09))
-  (fp_line (start -5 -2.025) (end -4.5 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 04069531-43ee-402f-b7fa-c26bc24e10b8))
-  (fp_line (start -7.5 -2.025) (end 7.5 -2.025) (layer "F.Fab") (width 0.1) (tstamp 263fb4d4-9b7f-4b1d-9934-c77a65eb3594))
-  (fp_line (start 7.5 -2.025) (end 7.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 33f08e7f-6fca-4590-9b08-544521405c2f))
-  (fp_line (start -7.5 -2.025) (end -7.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 5801d2b7-1633-4dee-ba91-e07c82af682f))
-  (fp_line (start -4.5 -1.317893) (end -4 -2.025) (layer "F.Fab") (width 0.1) (tstamp a652a1ad-21d8-48d4-b11d-fc2e054f45a0))
-  (pad "1" smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 542c63d2-1cfa-4612-9ee4-e8daac529d64))
-  (pad "2" smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0c2c90c0-5e53-47a7-ae2b-dedb75979008))
-  (pad "3" smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5f220980-d5c1-4a20-b6df-d4be310746be))
-  (pad "4" smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e54fc084-4f21-499c-9515-8772d1c4006c))
-  (pad "5" smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d26da802-b205-469a-8992-66ed60c0c6c5))
-  (pad "6" smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f44a30dd-60e6-46bd-9869-160954cf86cb))
-  (pad "7" smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 90242c74-fb9e-4f59-8f21-f9ad3e747027))
-  (pad "MP" smd roundrect (at 7.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp b5903390-5d34-424a-9a09-8c1aef7f2bed))
-  (pad "MP" smd roundrect (at -7.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e3f80905-5a55-40f8-bbc6-a8cdf941d55c))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM07B-ZESS-TB_1x07-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal.kicad_mod
index f079212d0..ea68aa4e7 100644
--- a/Connector_JST.pretty/JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,50 +1,64 @@
-(footprint "JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM08B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1af90742-f540-465f-b625-4824985ea423)
   )
-  (fp_text value "JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d7eddda6-135e-4104-b4dc-d08e315cd1e1)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -8.25 -2.025) (end 8.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.36 -0.035) (end -8.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.36 -2.135) (end -5.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -5.91 -2.135) (end -5.91 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.36 -0.035) (end 8.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.36 -2.135) (end 5.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.36 4.285) (end -8.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.36 5.585) (end 8.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 8.36 5.585) (end 8.36 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.25 5.475) (end 8.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -2.025) (end -8.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 8.25 -2.025) (end 8.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.25 -4.52) (end -9.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.25 5.98) (end 9.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.25 5.98) (end 9.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 9.25 -4.52) (end -9.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -5.75 -2.025) (end -5.25 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -5.25 -1.317893) (end -4.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -7.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 7.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a8211938-5b52-4b07-9cdc-bd17f5155409)
   )
-  (fp_line (start -5.91 -2.135) (end -5.91 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 21984068-53cf-46fa-b5ed-9c5eeab0bc9e))
-  (fp_line (start 8.36 -0.035) (end 8.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 28466ec7-aaf4-4ae3-9a5b-512ee28d069c))
-  (fp_line (start 8.36 -2.135) (end 5.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 2fa8a5e7-3265-4316-a869-f827c2d11d0b))
-  (fp_line (start -8.36 -0.035) (end -8.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 426c37cc-ec5d-471f-a08f-71f7d0de24be))
-  (fp_line (start -8.36 4.285) (end -8.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp 4cb0159d-f577-49bf-bc77-086fc833fd8d))
-  (fp_line (start -8.36 -2.135) (end -5.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp b1716689-c206-4071-8ae1-9c286f6c4cfa))
-  (fp_line (start 8.36 5.585) (end 8.36 4.285) (layer "F.SilkS") (width 0.12) (tstamp bd2a6f76-4d52-49e0-a6b2-e76e8a887f4c))
-  (fp_line (start -8.36 5.585) (end 8.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp c5c5823b-64a6-4d33-a3b8-90e57ed7833f))
-  (fp_line (start -9.25 5.98) (end 9.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 0310037f-09c5-4e1d-9e4d-2c4ee80f91eb))
-  (fp_line (start 9.25 -4.52) (end -9.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 25337ca5-c57c-40ca-8a05-0e0026049623))
-  (fp_line (start -9.25 -4.52) (end -9.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 3f2cadfe-cc4f-4822-b29c-cd639194098d))
-  (fp_line (start 9.25 5.98) (end 9.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 52c972dc-6c26-4b2a-9514-6127964d7fff))
-  (fp_line (start -5.75 -2.025) (end -5.25 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 033112d8-5e93-44bc-aeb8-b07c158b25b5))
-  (fp_line (start -8.25 -2.025) (end 8.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp 4916925f-f1f2-43f9-b854-99bf1667575d))
-  (fp_line (start -8.25 5.475) (end 8.25 5.475) (layer "F.Fab") (width 0.1) (tstamp 634dfaf2-b69d-41d9-b141-5c34fe03c9fc))
-  (fp_line (start -5.25 -1.317893) (end -4.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 8057970a-b7dc-4990-87c4-67075021671d))
-  (fp_line (start 8.25 -2.025) (end 8.25 5.475) (layer "F.Fab") (width 0.1) (tstamp b6b19696-b90d-4d25-9fdc-62980da41ba5))
-  (fp_line (start -8.25 -2.025) (end -8.25 5.475) (layer "F.Fab") (width 0.1) (tstamp f034fdc3-a47c-4a01-abaf-d74f1a084e8c))
-  (pad "1" smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f10e5ff1-f568-436f-bd7f-635389e9b340))
-  (pad "2" smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 21ddd88a-7296-415b-a5a3-1f4eea6cdd30))
-  (pad "3" smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 03285ae1-eb62-4c0d-9d8c-3770f7c03230))
-  (pad "4" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cca63b41-9fda-4f34-b712-e2fb83ca3a14))
-  (pad "5" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 84ae27db-24dc-43ae-beda-1a69fc6c6ae2))
-  (pad "6" smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cc18b9a4-e803-4ae5-928b-dc08dff9f4d9))
-  (pad "7" smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8ec9104a-4abf-4adb-ab01-408aaa2998a3))
-  (pad "8" smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d83628e-c504-4ff4-b866-f1eafe8e9627))
-  (pad "MP" smd roundrect (at -7.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 837bb307-4a45-4c1a-b791-a9d9cf3f909b))
-  (pad "MP" smd roundrect (at 7.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp c391dbba-1842-45b7-99b2-e28ef7c7db55))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM08B-ZESS-TB_1x08-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal.kicad_mod
index e69164933..afc74f3a3 100644
--- a/Connector_JST.pretty/JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,51 +1,65 @@
-(footprint "JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM09B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d8feec9a-41a5-4268-a583-0ce4d20c879d)
   )
-  (fp_text value "JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8fc50648-cd17-4dd7-ad20-a82db27a72b0)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -9 -2.025) (end 9 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.11 -0.035) (end -9.11 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.11 -2.135) (end -6.66 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -6.66 -2.135) (end -6.66 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.11 -0.035) (end 9.11 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.11 -2.135) (end 6.66 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.11 4.285) (end -9.11 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.11 5.585) (end 9.11 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.11 5.585) (end 9.11 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9 5.475) (end 9 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 -2.025) (end -9 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9 -2.025) (end 9 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10 -4.52) (end -10 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10 5.98) (end 10 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 5.98) (end 10 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10 -4.52) (end -10 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -6.5 -2.025) (end -6 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6 -1.317893) (end -5.5 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -8.6 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 8.6 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c1aa2890-2f29-4e4b-865f-bdde154cb04f)
   )
-  (fp_line (start -9.11 5.585) (end 9.11 5.585) (layer "F.SilkS") (width 0.12) (tstamp 34d339ae-4ca4-49c0-a972-dc1d11f2569c))
-  (fp_line (start -9.11 -2.135) (end -6.66 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 4af2bb22-8939-4bb8-8194-ce130f5d290c))
-  (fp_line (start 9.11 -0.035) (end 9.11 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 4c31949f-0579-415e-a39b-5a096cebf595))
-  (fp_line (start -9.11 4.285) (end -9.11 5.585) (layer "F.SilkS") (width 0.12) (tstamp 51dc119f-44ca-4be6-9ef9-03be27d2f394))
-  (fp_line (start -6.66 -2.135) (end -6.66 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 5e058c34-55d8-46e1-99c7-dd50c3d3d1eb))
-  (fp_line (start -9.11 -0.035) (end -9.11 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 68d39580-fdf5-4831-a456-6b53c3179ffb))
-  (fp_line (start 9.11 -2.135) (end 6.66 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 7db9b307-27b7-4583-a91d-ecff5c98fa67))
-  (fp_line (start 9.11 5.585) (end 9.11 4.285) (layer "F.SilkS") (width 0.12) (tstamp be412e3b-c2af-427f-baf3-03ab9d09551e))
-  (fp_line (start 10 -4.52) (end -10 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 03011723-8b6e-43e6-907e-e26f64a0d93e))
-  (fp_line (start -10 5.98) (end 10 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 28388e01-3438-47f5-915f-f34f9902e9b9))
-  (fp_line (start -10 -4.52) (end -10 5.98) (layer "F.CrtYd") (width 0.05) (tstamp a823e105-0450-444b-a0ba-0c21c285f368))
-  (fp_line (start 10 5.98) (end 10 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp ce310dd9-66c3-42f5-acbe-18774d96410c))
-  (fp_line (start -9 -2.025) (end 9 -2.025) (layer "F.Fab") (width 0.1) (tstamp 099fc4c8-4c72-4ca1-8b49-f080373f1e5b))
-  (fp_line (start -6 -1.317893) (end -5.5 -2.025) (layer "F.Fab") (width 0.1) (tstamp 12c23e81-f1db-4fe7-a742-d0011f1055a4))
-  (fp_line (start -9 5.475) (end 9 5.475) (layer "F.Fab") (width 0.1) (tstamp 8319d14e-5f15-4f5c-b0df-1d1227b3278c))
-  (fp_line (start 9 -2.025) (end 9 5.475) (layer "F.Fab") (width 0.1) (tstamp 91476189-4a6e-4811-938b-b6a7622b6905))
-  (fp_line (start -6.5 -2.025) (end -6 -1.317893) (layer "F.Fab") (width 0.1) (tstamp b2c5efb5-1167-4d4c-a8b9-4ee13f5e4e5e))
-  (fp_line (start -9 -2.025) (end -9 5.475) (layer "F.Fab") (width 0.1) (tstamp b9d0f99c-87b3-41fa-a3df-271091ec63bc))
-  (pad "1" smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d7404a8-7b9a-492e-8515-efb41c189425))
-  (pad "2" smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b152ded1-d1ae-492e-a1dc-014b29a9d171))
-  (pad "3" smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f35c3aca-ade4-4555-bd06-0b7b3cb98ed9))
-  (pad "4" smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d9fa8e4a-5cc4-4dd3-899d-3e5caffd6c71))
-  (pad "5" smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 55eaddf5-5a11-4ae5-9b0b-4190cf31665c))
-  (pad "6" smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c380c185-6653-45c2-b6c8-48f19bbc279e))
-  (pad "7" smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 99d6d7cd-39ef-484c-b986-6bc13271d7d9))
-  (pad "8" smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9fe5b3de-689e-4913-9bc4-6c99a3884849))
-  (pad "9" smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp da153c49-0b8a-4921-a219-f0759c780307))
-  (pad "MP" smd roundrect (at 8.6 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 025e1d7c-e379-4602-8015-8e6616041d23))
-  (pad "MP" smd roundrect (at -8.6 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e27dada2-780a-4530-bf9f-eb51e52be25f))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM09B-ZESS-TB_1x09-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal.kicad_mod
index 40984bbc5..7ce604f3e 100644
--- a/Connector_JST.pretty/JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,52 +1,66 @@
-(footprint "JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM10B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 55a4b898-a50f-4cf0-b6b1-db5966a458c0)
   )
-  (fp_text value "JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8447243b-52b8-4f6e-a8fa-a731d23c0f0d)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -9.75 -2.025) (end 9.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.86 -0.035) (end -9.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.86 -2.135) (end -7.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -7.41 -2.135) (end -7.41 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 -0.035) (end 9.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 -2.135) (end 7.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.86 4.285) (end -9.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.86 5.585) (end 9.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 9.86 5.585) (end 9.86 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.75 5.475) (end 9.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -2.025) (end -9.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 9.75 -2.025) (end 9.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.75 -4.52) (end -10.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.75 5.98) (end 10.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.75 5.98) (end 10.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 10.75 -4.52) (end -10.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -7.25 -2.025) (end -6.75 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -6.75 -1.317893) (end -6.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -9.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 9.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e7afbe94-0d00-4979-ac4e-b5ba4096e413)
   )
-  (fp_line (start -7.41 -2.135) (end -7.41 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 4a99302c-fa3a-44ff-9811-39749c433529))
-  (fp_line (start -9.86 5.585) (end 9.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp 5421ef6d-b0e2-43ac-b1d8-b3926f3883f4))
-  (fp_line (start -9.86 -2.135) (end -7.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 6cc4367a-e016-4365-90ee-aeac4ad5c63b))
-  (fp_line (start 9.86 5.585) (end 9.86 4.285) (layer "F.SilkS") (width 0.12) (tstamp a3932b6f-3b76-4dff-9154-72ee8e040a5b))
-  (fp_line (start -9.86 -0.035) (end -9.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp afa9c363-d2bf-4c2d-81c6-0b95a7e4cef0))
-  (fp_line (start 9.86 -2.135) (end 7.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp cbad15c5-21bf-43f2-904b-83514ad1e446))
-  (fp_line (start 9.86 -0.035) (end 9.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp cf48c391-28a7-435b-8596-46c2afaa23a8))
-  (fp_line (start -9.86 4.285) (end -9.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp dba7e4f9-6576-411e-b517-fdf249822762))
-  (fp_line (start 10.75 -4.52) (end -10.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 34e3ab5e-059a-4c75-8117-a341d8f6093f))
-  (fp_line (start -10.75 -4.52) (end -10.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 6273d3e8-33e0-4ff8-a710-33cb27d8327c))
-  (fp_line (start 10.75 5.98) (end 10.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp c2583e98-4ec4-40eb-81b2-0e700af5d796))
-  (fp_line (start -10.75 5.98) (end 10.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp e6c5025c-567b-4bb1-8175-c9c16d1d9765))
-  (fp_line (start -6.75 -1.317893) (end -6.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp 1bd781f4-4905-4ed2-afc7-fb3d91fafb9d))
-  (fp_line (start -9.75 5.475) (end 9.75 5.475) (layer "F.Fab") (width 0.1) (tstamp 33593c06-49a4-4d15-809b-21f07a0ee49a))
-  (fp_line (start -7.25 -2.025) (end -6.75 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 5f9a8fdd-d7fd-4560-a0e4-ba65cd640337))
-  (fp_line (start -9.75 -2.025) (end -9.75 5.475) (layer "F.Fab") (width 0.1) (tstamp 68d647e4-3481-4c9e-a09e-f7640d137f71))
-  (fp_line (start -9.75 -2.025) (end 9.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 6b3f4c71-000e-4eae-b916-4fdc85051cf7))
-  (fp_line (start 9.75 -2.025) (end 9.75 5.475) (layer "F.Fab") (width 0.1) (tstamp 90cda99c-965e-4dd1-ab7e-26a3afe3ff7e))
-  (pad "1" smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8ea67e6f-44b1-4913-8cf5-d92e920f17e6))
-  (pad "2" smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2ba9d224-1f38-423b-a2a3-3fc7773a5c8f))
-  (pad "3" smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 98c034d0-d3d4-472b-a692-c55929502017))
-  (pad "4" smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c8ba50c3-ba29-42d5-96d9-4e811114bfe4))
-  (pad "5" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 28c4abad-349b-4691-9d09-00e93c73633c))
-  (pad "6" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 55fa140d-3ba6-4bf8-9661-7708fd460ba8))
-  (pad "7" smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d28ebbc8-a967-4bec-ae6d-6c350ad57b07))
-  (pad "8" smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4a491e05-33bf-413e-96c7-b6e8b3aa6754))
-  (pad "9" smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bb7257a0-23b5-49ab-95bc-be34e7a65e72))
-  (pad "10" smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp dfddcb52-6f85-46b0-a69b-e994f4d2baec))
-  (pad "MP" smd roundrect (at 9.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 2be39a44-a70f-4c1e-9b63-e527e091c492))
-  (pad "MP" smd roundrect (at -9.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp a1370192-9e86-4e69-9358-3a0f9b997ea9))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM10B-ZESS-TB_1x10-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal.kicad_mod
index d5b9f4644..df1279f4e 100644
--- a/Connector_JST.pretty/JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,53 +1,67 @@
-(footprint "JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM11B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp fefbe2fc-ab75-4712-8a3c-9c18bbca928d)
   )
-  (fp_text value "JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a3baddc3-73ed-4341-9c52-d0a79f64080a)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -10.5 -2.025) (end 10.5 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.61 -0.035) (end -10.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.61 -2.135) (end -8.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.16 -2.135) (end -8.16 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.61 -0.035) (end 10.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.61 -2.135) (end 8.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.61 4.285) (end -10.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.61 5.585) (end 10.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 10.61 5.585) (end 10.61 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.5 5.475) (end 10.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.5 -2.025) (end -10.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 10.5 -2.025) (end 10.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.5 -4.52) (end -11.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.5 5.98) (end 11.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.5 5.98) (end 11.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 11.5 -4.52) (end -11.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8 -2.025) (end -7.5 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -7.5 -1.317893) (end -7 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -7.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 7.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 10.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ec25405a-1f6d-438a-a9af-ecdbfa4f67b2)
   )
-  (fp_line (start 10.61 5.585) (end 10.61 4.285) (layer "F.SilkS") (width 0.12) (tstamp 17d72f66-0082-4b61-88e5-34d1547606e9))
-  (fp_line (start -8.16 -2.135) (end -8.16 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 550a38fd-d5d9-48cb-8d1d-b93836c3fc32))
-  (fp_line (start -10.61 -2.135) (end -8.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 6751a44f-64eb-4e3f-a75d-cf213b2c1a45))
-  (fp_line (start 10.61 -2.135) (end 8.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 6c0adde5-3e3f-4678-a1ff-9199cf2f1b22))
-  (fp_line (start -10.61 5.585) (end 10.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp 7e07f59c-c400-46ef-80cc-3eaf3a573118))
-  (fp_line (start 10.61 -0.035) (end 10.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 8a753bf5-8b95-4fc6-84f8-f8644c1c3a61))
-  (fp_line (start -10.61 -0.035) (end -10.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 97bbf9c4-9fe7-48d5-9cfb-8aefae643303))
-  (fp_line (start -10.61 4.285) (end -10.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp fb4120a0-6065-486e-b373-f409dc887b30))
-  (fp_line (start 11.5 -4.52) (end -11.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 32731a43-c65e-4b9d-adff-9eb393f438ff))
-  (fp_line (start -11.5 -4.52) (end -11.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 6d092df2-6e4b-45a8-97df-77bd9b7e33c9))
-  (fp_line (start 11.5 5.98) (end 11.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 96f07bc1-dab6-4d46-b838-44c82c777d11))
-  (fp_line (start -11.5 5.98) (end 11.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp efabdb85-add5-43f1-830f-b163ecdd1dfa))
-  (fp_line (start -8 -2.025) (end -7.5 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 1283d787-59cb-47e4-ab80-8a793ab430f1))
-  (fp_line (start -10.5 -2.025) (end 10.5 -2.025) (layer "F.Fab") (width 0.1) (tstamp 164e50b8-ca3d-4602-8696-31ad81f59117))
-  (fp_line (start -10.5 -2.025) (end -10.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 442db79f-e616-463b-a4ca-8320091754c5))
-  (fp_line (start -10.5 5.475) (end 10.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 7b8619e7-4586-4ec0-96ef-1f17b1d2d368))
-  (fp_line (start 10.5 -2.025) (end 10.5 5.475) (layer "F.Fab") (width 0.1) (tstamp ab273def-9835-4c95-a467-5e5b14a4a58f))
-  (fp_line (start -7.5 -1.317893) (end -7 -2.025) (layer "F.Fab") (width 0.1) (tstamp ba1ceed6-49f9-47ee-8e79-14c2b4fd2483))
-  (pad "1" smd roundrect (at -7.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3e91e66d-d190-4772-8410-c2318130407b))
-  (pad "2" smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 66297b09-8899-483c-b9ab-36b7dbad1238))
-  (pad "3" smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 59333e80-9752-4ae5-99e2-21d5df83d91f))
-  (pad "4" smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0945b43a-5cd1-426e-83ca-5c5d44165682))
-  (pad "5" smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e852cb4-4883-4a8f-810d-4a9a2e4ad042))
-  (pad "6" smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7483ee12-a211-47d1-98e7-dcbb7a1e0df0))
-  (pad "7" smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 802b3ed3-1e1d-442a-b040-f92a70bc20cb))
-  (pad "8" smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3a93b5f8-4a7d-4d5e-b0fe-eb32e9eb4b87))
-  (pad "9" smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 08a3aab7-5009-4e09-a6f5-216fa6c035fa))
-  (pad "10" smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b1cdb70e-d989-4569-871e-427bf5c60a74))
-  (pad "11" smd roundrect (at 7.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d27f77c5-e357-4433-9742-64e7cba2d218))
-  (pad "MP" smd roundrect (at -10.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 3ad3b274-ebcc-4f15-8776-809528228c49))
-  (pad "MP" smd roundrect (at 10.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 72dbdf38-a394-4a12-86fe-d0acfe75fe6d))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM11B-ZESS-TB_1x11-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal.kicad_mod
index 68cbb0eed..323f0952f 100644
--- a/Connector_JST.pretty/JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,54 +1,68 @@
-(footprint "JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM12B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5d40ced-6c2f-424d-8454-f5f87d69391d)
   )
-  (fp_text value "JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 0933d3c4-ffa0-4287-92f3-e7b8506f90f8)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -11.25 -2.025) (end 11.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.36 -0.035) (end -11.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.36 -2.135) (end -8.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -8.91 -2.135) (end -8.91 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.36 -0.035) (end 11.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.36 -2.135) (end 8.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.36 4.285) (end -11.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.36 5.585) (end 11.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 11.36 5.585) (end 11.36 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.25 5.475) (end 11.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -2.025) (end -11.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 11.25 -2.025) (end 11.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.25 -4.52) (end -12.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -12.25 5.98) (end 12.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.25 5.98) (end 12.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 12.25 -4.52) (end -12.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -8.75 -2.025) (end -8.25 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -8.25 -1.317893) (end -7.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -8.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 8.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -10.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 10.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp e98d0834-bf67-42c4-93bb-1c04faddccbd)
   )
-  (fp_line (start -8.91 -2.135) (end -8.91 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 2ae34735-8ae6-403c-b343-f800e38ef1d8))
-  (fp_line (start -11.36 4.285) (end -11.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp 31da1804-d45c-4c85-ad87-5be564405688))
-  (fp_line (start 11.36 5.585) (end 11.36 4.285) (layer "F.SilkS") (width 0.12) (tstamp 3d248473-31f0-449c-bd79-f37e14e845ce))
-  (fp_line (start -11.36 5.585) (end 11.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp 4b9070a4-6a7b-41d5-9b37-3ab3ada1506e))
-  (fp_line (start -11.36 -0.035) (end -11.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 9b7ebf53-d4cf-45e5-b721-249d761f1f2b))
-  (fp_line (start -11.36 -2.135) (end -8.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp a5cb6adc-4abf-4241-881b-13826fdec77d))
-  (fp_line (start 11.36 -0.035) (end 11.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp dea2f7ae-ef0c-4790-81a1-c2bbfbf3059e))
-  (fp_line (start 11.36 -2.135) (end 8.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp f95897b6-a0a8-4732-8278-8dd1e809131b))
-  (fp_line (start -12.25 -4.52) (end -12.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 1b70718a-3323-4c65-861f-1174e43f5fc9))
-  (fp_line (start 12.25 5.98) (end 12.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 940af961-5efd-4795-89c3-7935cb23fbd3))
-  (fp_line (start -12.25 5.98) (end 12.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp c98c8c24-ba50-44d5-80ee-073ea61d809a))
-  (fp_line (start 12.25 -4.52) (end -12.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp f5e6a10e-74bf-4a94-815e-27904cb5a8e7))
-  (fp_line (start -11.25 5.475) (end 11.25 5.475) (layer "F.Fab") (width 0.1) (tstamp 0614c580-c47a-4c33-9ccf-72744ca1a22e))
-  (fp_line (start 11.25 -2.025) (end 11.25 5.475) (layer "F.Fab") (width 0.1) (tstamp 68afa3d9-3962-4486-b72e-51f49fe87aed))
-  (fp_line (start -11.25 -2.025) (end 11.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp 7ead101c-5399-4d1e-b812-be86b17ad0b5))
-  (fp_line (start -8.25 -1.317893) (end -7.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 983e81ff-c78f-4c94-8619-556c624bb5c1))
-  (fp_line (start -8.75 -2.025) (end -8.25 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 9bfb0237-e73e-48fd-aa12-538d20c13553))
-  (fp_line (start -11.25 -2.025) (end -11.25 5.475) (layer "F.Fab") (width 0.1) (tstamp b3519944-bb9a-44d7-9c53-5cd433a8ba75))
-  (pad "1" smd roundrect (at -8.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8d100a89-2680-4437-81a9-4ad9ee2b9e09))
-  (pad "2" smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5969410-72ee-4342-b064-61e5b6774337))
-  (pad "3" smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 25cebb8f-422d-46a5-b015-5f9aa225467f))
-  (pad "4" smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 38d02a06-12a8-4d2a-bab8-f6933b132ed4))
-  (pad "5" smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9519e8d3-fa3a-4de1-ab10-5f214f158e95))
-  (pad "6" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp faf46873-b397-4c0d-9df1-24e52269fac6))
-  (pad "7" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp cb9bf7eb-9065-46da-b470-04e533845fe1))
-  (pad "8" smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4253286c-f442-413c-9ac8-bb9f1bb80047))
-  (pad "9" smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 77adb716-73c5-4454-9d61-4d9d38b64d5e))
-  (pad "10" smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b212936a-bad7-4fec-b296-f1e23ea71345))
-  (pad "11" smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 20fc89ed-4656-4ff4-9d71-b414376916a9))
-  (pad "12" smd roundrect (at 8.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3dfd8b68-b833-4cdb-b02e-54c4b58fb3bf))
-  (pad "MP" smd roundrect (at -10.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 8a6675e2-a258-42f9-8ea3-463a55433985))
-  (pad "MP" smd roundrect (at 10.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp f522858c-24f9-47dd-b46f-103730d8934b))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM12B-ZESS-TB_1x12-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal.kicad_mod
index a02cb2668..13e689455 100644
--- a/Connector_JST.pretty/JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,55 +1,69 @@
-(footprint "JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BC)
+(footprint JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM13B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 109ae043-f95f-4dd3-8623-e7c07fd0315e)
   )
-  (fp_text value "JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ad8131c9-ff70-440c-af3a-91f638581261)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -12 -2.025) (end 12 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.11 -0.035) (end -12.11 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.11 -2.135) (end -9.66 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -9.66 -2.135) (end -9.66 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.11 -0.035) (end 12.11 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.11 -2.135) (end 9.66 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.11 4.285) (end -12.11 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.11 5.585) (end 12.11 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.11 5.585) (end 12.11 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12 5.475) (end 12 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12 -2.025) (end -12 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12 -2.025) (end 12 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13 -4.52) (end -13 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13 5.98) (end 13 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13 5.98) (end 13 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13 -4.52) (end -13 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -9.5 -2.025) (end -9 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9 -1.317893) (end -8.5 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -7.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 7.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 9 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -11.6 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 11.6 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f4e95ae5-4064-4b91-8ea6-7672e03fe930)
   )
-  (fp_line (start -12.11 -2.135) (end -9.66 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 12aa92fd-6348-4229-bbe6-448360348dbb))
-  (fp_line (start 12.11 -2.135) (end 9.66 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 1774945f-cecd-4021-ba56-3daa616d2bc5))
-  (fp_line (start -12.11 5.585) (end 12.11 5.585) (layer "F.SilkS") (width 0.12) (tstamp 45fe233d-de6f-4155-894b-22c401539c38))
-  (fp_line (start 12.11 5.585) (end 12.11 4.285) (layer "F.SilkS") (width 0.12) (tstamp 5118db35-14fc-4568-8ba8-b79307ca2fc6))
-  (fp_line (start -9.66 -2.135) (end -9.66 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 697b7917-7c31-467d-96ca-503b3451bdd6))
-  (fp_line (start 12.11 -0.035) (end 12.11 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 89eed598-4df4-491b-8abe-9ba7ee36cfc2))
-  (fp_line (start -12.11 -0.035) (end -12.11 -2.135) (layer "F.SilkS") (width 0.12) (tstamp cc052951-8ef3-497a-816b-b7e2f101170b))
-  (fp_line (start -12.11 4.285) (end -12.11 5.585) (layer "F.SilkS") (width 0.12) (tstamp f7685108-640f-45f1-929e-a02b83f6bf7f))
-  (fp_line (start 13 5.98) (end 13 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 52f8d9d0-4f82-46ff-94b5-1c0b3a27cebf))
-  (fp_line (start -13 -4.52) (end -13 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 5448ed18-8a5c-4a7b-9d76-66b23d8725d3))
-  (fp_line (start 13 -4.52) (end -13 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 9209ea11-68b0-42c2-8ea7-d6e1d2078716))
-  (fp_line (start -13 5.98) (end 13 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 94880794-a97d-46a1-98fc-3ecdfcaca35d))
-  (fp_line (start -9.5 -2.025) (end -9 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 0d20e02c-78ef-4a29-8c2c-9f189682d3ad))
-  (fp_line (start -12 -2.025) (end -12 5.475) (layer "F.Fab") (width 0.1) (tstamp 491cc6a0-3d3e-40e0-a348-38c60b766713))
-  (fp_line (start -12 -2.025) (end 12 -2.025) (layer "F.Fab") (width 0.1) (tstamp 5b32563a-79f3-4d39-b827-fa3193de31da))
-  (fp_line (start -9 -1.317893) (end -8.5 -2.025) (layer "F.Fab") (width 0.1) (tstamp a084b68a-e544-4a0c-af8e-e564a1ba107f))
-  (fp_line (start -12 5.475) (end 12 5.475) (layer "F.Fab") (width 0.1) (tstamp d14c6460-7b9c-407b-b353-f61cfd424e77))
-  (fp_line (start 12 -2.025) (end 12 5.475) (layer "F.Fab") (width 0.1) (tstamp e92a2a17-b881-4082-8bc6-4dad1e977588))
-  (pad "1" smd roundrect (at -9 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4eeaa324-6ea1-45e8-a823-97a20bbbc783))
-  (pad "2" smd roundrect (at -7.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 78df9f0a-b060-4152-ba47-8a0e0c1883cb))
-  (pad "3" smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 91313497-dbed-4381-aa31-e1da7b52e1e1))
-  (pad "4" smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2e824c05-38ba-4a9d-93f3-0e878b015426))
-  (pad "5" smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2f859383-ab0e-460d-a0cd-ee11c979c8fb))
-  (pad "6" smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d579121f-14a5-40a1-940e-25562aa92058))
-  (pad "7" smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 734941d0-fc4a-46cb-889f-bf6734d057df))
-  (pad "8" smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a2883957-6521-44ec-b30e-7f621b8be405))
-  (pad "9" smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 95e2359a-418f-4870-b980-581729d8fe3d))
-  (pad "10" smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 30e3b7cc-2186-41d2-b642-589acef374d8))
-  (pad "11" smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b9cf427b-94ca-4fa8-aa16-8ff52d4c36c1))
-  (pad "12" smd roundrect (at 7.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2dd5b8ed-2c68-4492-a8e0-469023859e07))
-  (pad "13" smd roundrect (at 9 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b858adad-3e9a-4f06-8400-e4c25327f49a))
-  (pad "MP" smd roundrect (at -11.6 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp b54101d4-39bb-416a-b5a6-7a419e9548b8))
-  (pad "MP" smd roundrect (at 11.6 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp d21be862-e455-4e5e-9018-c8ff5e871d60))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM13B-ZESS-TB_1x13-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal.kicad_mod
index a6d72bfab..a346e1ac5 100644
--- a/Connector_JST.pretty/JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,56 +1,70 @@
-(footprint "JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM14B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2ad85ecf-6a7c-4a23-8f02-0b2508072d9c)
   )
-  (fp_text value "JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c4b6acde-90e1-4f4c-a258-b60be86f4dab)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -12.75 -2.025) (end 12.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.86 -0.035) (end -12.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.86 -2.135) (end -10.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -10.41 -2.135) (end -10.41 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.86 -0.035) (end 12.86 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.86 -2.135) (end 10.41 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.86 4.285) (end -12.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.86 5.585) (end 12.86 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 12.86 5.585) (end 12.86 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -12.75 5.475) (end 12.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -12.75 -2.025) (end -12.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 12.75 -2.025) (end 12.75 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.75 -4.52) (end -13.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -13.75 5.98) (end 13.75 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.75 5.98) (end 13.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 13.75 -4.52) (end -13.75 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -10.25 -2.025) (end -9.75 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -9.75 -1.317893) (end -9.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -9.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -8.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 8.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 9.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -12.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 12.35 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5daf9bfd-01bb-4786-81ea-06ca281aa863)
   )
-  (fp_line (start -12.86 -2.135) (end -10.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 1413d405-20c4-4332-858d-ecb7ff7dbeab))
-  (fp_line (start -12.86 4.285) (end -12.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp 153b753a-43c8-4a0a-b147-d278c09aab03))
-  (fp_line (start -12.86 -0.035) (end -12.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 18951be0-4871-45d7-b5f8-b9a64d5d963f))
-  (fp_line (start -10.41 -2.135) (end -10.41 -4.025) (layer "F.SilkS") (width 0.12) (tstamp 1eeaf1c5-76db-43af-af31-5b8e95f68ec7))
-  (fp_line (start 12.86 -0.035) (end 12.86 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 4ffcb191-891b-42c8-ab53-749ad9f98377))
-  (fp_line (start 12.86 -2.135) (end 10.41 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 6e0a27b8-ba04-4c38-89ed-58e64a2d73c2))
-  (fp_line (start -12.86 5.585) (end 12.86 5.585) (layer "F.SilkS") (width 0.12) (tstamp 8bc3d4a7-e89d-4284-aacb-392dbeffe47c))
-  (fp_line (start 12.86 5.585) (end 12.86 4.285) (layer "F.SilkS") (width 0.12) (tstamp d434ef33-67fc-4c95-9a17-5bba10ead0ed))
-  (fp_line (start -13.75 -4.52) (end -13.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 245d904c-4d15-43c2-b763-29b659d83975))
-  (fp_line (start 13.75 -4.52) (end -13.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 3f8af32f-9235-41ea-af85-38c71df03a21))
-  (fp_line (start -13.75 5.98) (end 13.75 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 492b6401-969b-4ba4-bae0-da4b3f9cb8fa))
-  (fp_line (start 13.75 5.98) (end 13.75 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp e2366a57-dc48-4d23-b818-7bedf17dee44))
-  (fp_line (start -10.25 -2.025) (end -9.75 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 1be5dc78-ecb5-48b1-823c-ec2028d79a80))
-  (fp_line (start -12.75 -2.025) (end 12.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 33e7d61f-62a2-4b4e-94e9-c8a3e78be80f))
-  (fp_line (start -12.75 -2.025) (end -12.75 5.475) (layer "F.Fab") (width 0.1) (tstamp 75ded51d-48aa-41c4-b20f-0eb66113f8bc))
-  (fp_line (start -12.75 5.475) (end 12.75 5.475) (layer "F.Fab") (width 0.1) (tstamp 8804637d-c590-41f5-9b87-206a7deaa017))
-  (fp_line (start 12.75 -2.025) (end 12.75 5.475) (layer "F.Fab") (width 0.1) (tstamp a14f4e3a-90e8-46ce-8269-5db710ae6e22))
-  (fp_line (start -9.75 -1.317893) (end -9.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp ae71c73a-1765-49ae-9c1e-9c141bb33034))
-  (pad "1" smd roundrect (at -9.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e9ce2897-e7ed-4498-a031-d0a3393e992b))
-  (pad "2" smd roundrect (at -8.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f5dd7c27-5469-4306-95c1-af3394b53713))
-  (pad "3" smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 967a2cd5-7f25-4ecb-b3a1-ae8ec2304477))
-  (pad "4" smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 74836ebe-e85d-4d6d-b5e6-067da1da1c94))
-  (pad "5" smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4794299b-b91d-4c17-82b8-99d3d5eb0de3))
-  (pad "6" smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 230611f7-5464-40fd-9fda-34ed57324cce))
-  (pad "7" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 645c4fea-10c0-47e0-acea-740488e74d94))
-  (pad "8" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp afa6e421-6489-4ac0-894e-350e47e17d2c))
-  (pad "9" smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 60879452-194f-431f-aaec-6ba7cabb9d9b))
-  (pad "10" smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e2b04a92-c776-4101-97a5-9f247f778579))
-  (pad "11" smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5f5e2905-b186-4a13-bdfe-9cb604aac010))
-  (pad "12" smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e4a495a9-b5cf-48f7-85e5-e295b3fb582f))
-  (pad "13" smd roundrect (at 8.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ef95bb05-5de8-4f1c-b95b-263ac8d46f11))
-  (pad "14" smd roundrect (at 9.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c18e3b6-0234-4001-a8eb-18552bf2e273))
-  (pad "MP" smd roundrect (at 12.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 4b3ba17c-2c86-467f-ad43-af64a180e043))
-  (pad "MP" smd roundrect (at -12.35 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp a7903904-006c-4f5c-be18-a548321baed2))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM14B-ZESS-TB_1x14-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal.kicad_mod
index ea9bb2acd..ca848c82c 100644
--- a/Connector_JST.pretty/JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,57 +1,71 @@
-(footprint "JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM15B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 272095d0-66d8-4f97-84d7-cae62dfe00d2)
   )
-  (fp_text value "JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6a621e2c-6df4-4ff4-80cd-ac5c961c09bc)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -13.5 -2.025) (end 13.5 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.61 -0.035) (end -13.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.61 -2.135) (end -11.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.16 -2.135) (end -11.16 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.61 -0.035) (end 13.61 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.61 -2.135) (end 11.16 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.61 4.285) (end -13.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.61 5.585) (end 13.61 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 13.61 5.585) (end 13.61 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -13.5 5.475) (end 13.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -13.5 -2.025) (end -13.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 13.5 -2.025) (end 13.5 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.5 -4.52) (end -14.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -14.5 5.98) (end 14.5 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.5 5.98) (end 14.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 14.5 -4.52) (end -14.5 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11 -2.025) (end -10.5 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -10.5 -1.317893) (end -10 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -10.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -9 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -7.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 7.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 9 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 10.5 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -13.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 13.1 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp fb9d85fa-6761-4031-b914-5d7ef083d5d1)
   )
-  (fp_line (start -13.61 4.285) (end -13.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp 18932115-4530-4c6c-bdb5-17607dd6c97f))
-  (fp_line (start -13.61 -2.135) (end -11.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 657e1a59-12ee-44ee-a61a-084ebc8ef299))
-  (fp_line (start 13.61 -2.135) (end 11.16 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 6757337d-5237-4fb5-89f4-8ea4f30c35c0))
-  (fp_line (start -13.61 5.585) (end 13.61 5.585) (layer "F.SilkS") (width 0.12) (tstamp 6df2bd7a-8fd4-4ac6-9ae8-ff6a861de4b1))
-  (fp_line (start -13.61 -0.035) (end -13.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 7b9090cf-a17c-4396-9cbd-fb1db82ebf7b))
-  (fp_line (start 13.61 -0.035) (end 13.61 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 8ebff5bc-b1d0-4a92-a9c7-694264947f17))
-  (fp_line (start -11.16 -2.135) (end -11.16 -4.025) (layer "F.SilkS") (width 0.12) (tstamp cb0f077d-b8fa-4af0-be9a-99ea0e3a29d3))
-  (fp_line (start 13.61 5.585) (end 13.61 4.285) (layer "F.SilkS") (width 0.12) (tstamp fab04d50-196c-4e66-b280-8a2abdd835c6))
-  (fp_line (start -14.5 5.98) (end 14.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 0ea6c44b-5f56-42b1-b703-59c2a7b1fd09))
-  (fp_line (start 14.5 5.98) (end 14.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 4a5a2b69-a372-468e-b9f3-01baa37dcb3c))
-  (fp_line (start 14.5 -4.52) (end -14.5 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 6dae8a7f-51d6-4832-b0d9-eda23b2b413d))
-  (fp_line (start -14.5 -4.52) (end -14.5 5.98) (layer "F.CrtYd") (width 0.05) (tstamp 7cc83d3d-b492-4dac-b852-2c2047cd01f3))
-  (fp_line (start -13.5 -2.025) (end -13.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 08426f2c-5989-49af-9ffc-d6f0f71015d1))
-  (fp_line (start -13.5 -2.025) (end 13.5 -2.025) (layer "F.Fab") (width 0.1) (tstamp 1465d8d4-9571-41d2-bb08-a7a55d2beb4a))
-  (fp_line (start -11 -2.025) (end -10.5 -1.317893) (layer "F.Fab") (width 0.1) (tstamp 2670ab60-bac2-40a5-8835-9967bb816d0b))
-  (fp_line (start 13.5 -2.025) (end 13.5 5.475) (layer "F.Fab") (width 0.1) (tstamp 448f9f5d-a84b-4eeb-bf8c-c307f18af038))
-  (fp_line (start -13.5 5.475) (end 13.5 5.475) (layer "F.Fab") (width 0.1) (tstamp b12e2951-efd6-488b-ac0e-fd08bdf616b0))
-  (fp_line (start -10.5 -1.317893) (end -10 -2.025) (layer "F.Fab") (width 0.1) (tstamp fe0990a1-5cda-40ed-8a1c-48ed19a6bb2a))
-  (pad "1" smd roundrect (at -10.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ec584acf-195e-458a-9751-5540abc61ff3))
-  (pad "2" smd roundrect (at -9 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c131eb8b-eecf-4837-8351-7cce80dedc34))
-  (pad "3" smd roundrect (at -7.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1e74ed57-f186-48be-9cc3-e21202653024))
-  (pad "4" smd roundrect (at -6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5eeeb713-a40f-4984-a7d4-36d84e79c531))
-  (pad "5" smd roundrect (at -4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fd614096-e2a6-486d-8ac3-619126c9ecff))
-  (pad "6" smd roundrect (at -3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9f2cb68c-b6d7-41b1-8982-b9bb07d938b3))
-  (pad "7" smd roundrect (at -1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 37347494-9785-4983-84cb-8e8de3075947))
-  (pad "8" smd roundrect (at 0 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 023cd3a9-f7e3-4d6a-a3d3-ab56783a3ec9))
-  (pad "9" smd roundrect (at 1.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6b48078f-2aa8-431b-8213-f7f1ee38ee8c))
-  (pad "10" smd roundrect (at 3 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b7f3d22b-3632-4447-9a7f-ca9d183673b7))
-  (pad "11" smd roundrect (at 4.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2aaeb85a-0ddc-4d0f-9c1c-3a8ade1193ab))
-  (pad "12" smd roundrect (at 6 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 5c3b9b5a-0456-42cd-a48d-b69d4dfd24ef))
-  (pad "13" smd roundrect (at 7.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6d390223-2e5b-4f33-9d45-a80f6cdffab8))
-  (pad "14" smd roundrect (at 9 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 69db5520-f5b2-42d8-ae31-33fb1e3beb82))
-  (pad "15" smd roundrect (at 10.5 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3a4661e9-a21e-4e60-8f4e-9b02ccbe2737))
-  (pad "MP" smd roundrect (at -13.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp 64cbdb93-6456-4d16-bc77-c61e35a84624))
-  (pad "MP" smd roundrect (at 13.1 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp b758e26e-baf8-4244-bfbb-48799d3f3114))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM15B-ZESS-TB_1x15-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Connector_JST.pretty/JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal.kicad_mod b/Connector_JST.pretty/JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal.kicad_mod
index 62c508173..f0a593650 100644
--- a/Connector_JST.pretty/JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal.kicad_mod
+++ b/Connector_JST.pretty/JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal.kicad_mod
@@ -1,58 +1,72 @@
-(footprint "JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 5C2814BD)
+(footprint JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal (version 20221018) (generator kicad-footprint-generator)
+  (layer F.Cu)
   (descr "JST ZE series connector, SM16B-ZESS-TB (http://www.jst-mfg.com/product/pdf/eng/eZE.pdf), generated with kicad-footprint-generator")
   (tags "connector JST ZE horizontal")
   (attr smd)
-  (fp_text reference "REF**" (at 0 -5.22) (layer "F.SilkS")
+  (fp_text reference REF** (at 0 -5.22) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b9272e5c-c25f-43e6-928d-3198c54628a5)
   )
-  (fp_text value "JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal" (at 0 6.68) (layer "F.Fab")
+  (fp_text value JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal (at 0 6.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 36ae1637-1c71-4de3-b4b2-009c9867968a)
   )
-  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+  (fp_line (start -14.25 -2.025) (end 14.25 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.36 -0.035) (end -14.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.36 -2.135) (end -11.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -11.91 -2.135) (end -11.91 -4.025)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.36 -0.035) (end 14.36 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.36 -2.135) (end 11.91 -2.135)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.36 4.285) (end -14.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.36 5.585) (end 14.36 5.585)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start 14.36 5.585) (end 14.36 4.285)
+    (stroke (width 0.12) (type solid)) (layer F.SilkS))
+  (fp_line (start -14.25 5.475) (end 14.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -14.25 -2.025) (end -14.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start 14.25 -2.025) (end 14.25 5.475)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -15.25 -4.52) (end -15.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -15.25 5.98) (end 15.25 5.98)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.25 5.98) (end 15.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start 15.25 -4.52) (end -15.25 -4.52)
+    (stroke (width 0.05) (type solid)) (layer F.CrtYd))
+  (fp_line (start -11.75 -2.025) (end -11.25 -1.317893)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (fp_line (start -11.25 -1.317893) (end -10.75 -2.025)
+    (stroke (width 0.1) (type solid)) (layer F.Fab))
+  (pad 1 smd roundrect (at -11.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -9.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -8.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 8.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 9.75 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 11.25 -2.575) (size 0.8 2.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -13.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (pad MP smd roundrect (at 13.85 2.125) (size 1.8 3.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.138889))
+  (fp_text user ${REFERENCE} (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 23bdb246-3f3b-4951-83bb-322ad02e6e75)
   )
-  (fp_line (start -14.36 -0.035) (end -14.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 0010add7-6b21-4e1d-9e4a-1e6f903254ce))
-  (fp_line (start 14.36 5.585) (end 14.36 4.285) (layer "F.SilkS") (width 0.12) (tstamp 0bdcf0de-2edd-4fd3-8e5d-c1b54dd2593b))
-  (fp_line (start -14.36 -2.135) (end -11.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 4dce6e39-036f-4982-8ccd-f5a1c03f6860))
-  (fp_line (start 14.36 -0.035) (end 14.36 -2.135) (layer "F.SilkS") (width 0.12) (tstamp 5c30d752-aca9-4a29-ba1e-3e09ca507709))
-  (fp_line (start 14.36 -2.135) (end 11.91 -2.135) (layer "F.SilkS") (width 0.12) (tstamp a470500e-28fe-44ca-ab16-e9820218eb47))
-  (fp_line (start -11.91 -2.135) (end -11.91 -4.025) (layer "F.SilkS") (width 0.12) (tstamp c7b379b1-8830-4150-ad59-bbf687e76bd3))
-  (fp_line (start -14.36 4.285) (end -14.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp e0270fb5-f538-41ce-8bb0-ccdbda700568))
-  (fp_line (start -14.36 5.585) (end 14.36 5.585) (layer "F.SilkS") (width 0.12) (tstamp f1fac0a0-0db3-48cd-a135-7f20a0509450))
-  (fp_line (start 15.25 -4.52) (end -15.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 264efdcf-a97a-4815-9180-88d2fdbf352d))
-  (fp_line (start 15.25 5.98) (end 15.25 -4.52) (layer "F.CrtYd") (width 0.05) (tstamp 3f7b9a40-a76e-4d09-98cb-ce8aa983fde5))
-  (fp_line (start -15.25 5.98) (end 15.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp b4f94f50-a27c-42c6-ae23-a5a8547056f4))
-  (fp_line (start -15.25 -4.52) (end -15.25 5.98) (layer "F.CrtYd") (width 0.05) (tstamp f9aadf44-7ae3-40bb-8183-ba7445d4a842))
-  (fp_line (start -14.25 -2.025) (end 14.25 -2.025) (layer "F.Fab") (width 0.1) (tstamp 076b9c11-9ea3-4687-94c8-8d45cf8e8acf))
-  (fp_line (start -11.25 -1.317893) (end -10.75 -2.025) (layer "F.Fab") (width 0.1) (tstamp 31f7ae0a-808d-4d1b-97d9-d7a075876df1))
-  (fp_line (start -14.25 5.475) (end 14.25 5.475) (layer "F.Fab") (width 0.1) (tstamp 599efe6e-21ad-47ef-b673-2a663edd7eb4))
-  (fp_line (start -14.25 -2.025) (end -14.25 5.475) (layer "F.Fab") (width 0.1) (tstamp 5fb28f34-5bcd-4227-86af-83d75f9159ca))
-  (fp_line (start 14.25 -2.025) (end 14.25 5.475) (layer "F.Fab") (width 0.1) (tstamp cd651b49-6ad7-46e1-a1d0-c7faf46aee18))
-  (fp_line (start -11.75 -2.025) (end -11.25 -1.317893) (layer "F.Fab") (width 0.1) (tstamp d2a4e3dd-ba8f-41ea-be7c-cab490bafe8a))
-  (pad "1" smd roundrect (at -11.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f4c4fe0a-bc8f-4b80-bfc9-2d88b33084e4))
-  (pad "2" smd roundrect (at -9.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ba9bfda7-fc8f-45be-8f94-55c9cabcef96))
-  (pad "3" smd roundrect (at -8.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 169c3ff1-163b-4563-80f4-7cddba81422d))
-  (pad "4" smd roundrect (at -6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp da9b3753-9ef5-4c61-a1c7-6c476f7a76de))
-  (pad "5" smd roundrect (at -5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0e1d375d-6b5e-4a7b-8652-201da8027b54))
-  (pad "6" smd roundrect (at -3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4bf86576-4401-433f-bd7d-3b6a92563dfb))
-  (pad "7" smd roundrect (at -2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d00de48f-165d-4260-a821-eb97249c6c87))
-  (pad "8" smd roundrect (at -0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b1c46f33-4a33-404f-a953-69ae846a60c2))
-  (pad "9" smd roundrect (at 0.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp bc9c2af5-93c1-403e-8fb7-fef1e94f47b7))
-  (pad "10" smd roundrect (at 2.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2ce2e333-8073-4837-ad4a-5a876aeee6b3))
-  (pad "11" smd roundrect (at 3.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3b50b725-cd7e-44e7-baa9-8516f9d298d5))
-  (pad "12" smd roundrect (at 5.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp d9834d30-9403-4c03-9652-3eda5a4538a3))
-  (pad "13" smd roundrect (at 6.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 65aa24d3-8a43-44e6-84c8-aed88a5dc2c4))
-  (pad "14" smd roundrect (at 8.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 0d2d955c-ae69-46cc-9289-7ed5fa58249c))
-  (pad "15" smd roundrect (at 9.75 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3d8a2a7f-17c1-4397-a3cb-e0e05807ed9a))
-  (pad "16" smd roundrect (at 11.25 -2.575) (size 0.8 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7a4e6c01-7791-4e4e-8aef-61c296cc2edc))
-  (pad "MP" smd roundrect (at 13.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp d851ae14-e8bc-4fd6-9979-f606a44e5a4d))
-  (pad "MP" smd roundrect (at -13.85 2.125) (size 1.8 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.138889) (tstamp e62c2df7-2ec5-462e-a459-4f4e234909e0))
-  (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal.wrl"
+  (model ${KICAD7_3DMODEL_DIR}/Connector_JST.3dshapes/JST_ZE_SM16B-ZESS-TB_1x16-1MP_P1.50mm_Horizontal.wrl
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))