diff --git a/Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime.kicad_mod b/Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime.kicad_mod
index fda1ff8..2b8e8e3 100644
--- a/Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime.kicad_mod
+++ b/Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime.kicad_mod
@@ -1,33 +1,48 @@
-(module Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime (layer F.Cu) (tedit 5F723AE6)
+(footprint "Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
   (descr "SMD Crystal SERIES SMD7050/4 https://www.foxonline.com/pdfs/FQ7050.pdf, 7.0x5.0mm^2 package")
   (tags "SMD SMT crystal")
   (attr smd)
-  (fp_text reference REF** (at 0 0) (layer F.Fab)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text reference "REF**" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp adfaa2f6-596c-4c5a-88db-feab6ef3eacb)
   )
-  (fp_text value Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime (at 0 1.2) (layer F.Fab)
-    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  (fp_text value "Crystal_SMD_7050-4Pin_7.0x5.0mm_SiTime" (at 0 1.2) (layer "F.Fab")
+      (effects (font (size 0.508 0.508) (thickness 0.127)))
+    (tstamp 7663910f-7115-4abd-965d-623a21e7439b)
   )
-  (fp_text user %R (at 0 -3.4) (layer F.SilkS)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.SilkS")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp 35e5e173-747f-4b8e-887c-95732af0b6c4)
   )
-  (fp_line (start -3.5 -2.5) (end 3.5 -2.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.5 -2.5) (end 3.5 2.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.5 2.5) (end -3.5 2.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.5 2.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.5 1.5) (end -2.5 2.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.9 3.2) (end 0 3.2) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.8 -3.1) (end -3.8 3.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.8 3.1) (end 3.8 3.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.8 3.1) (end 3.8 -3.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.8 -3.1) (end -3.8 -3.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.9 3.2) (end -3.9 0) (layer F.SilkS) (width 0.12))
-  (pad 1 smd roundrect (at -2.54 1.905) (size 2.2 2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15))
-  (pad 2 smd roundrect (at 2.54 1.905) (size 2.2 2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15))
-  (pad 3 smd roundrect (at 2.54 -1.905) (size 2.2 2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15))
-  (pad 4 smd roundrect (at -2.54 -1.905) (size 2.2 2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15))
-  (model ${KICAD6_3DMODEL_DIR}/Crystal.3dshapes/Crystal_SMD_3225-4Pin_3.2x2.5mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -4 3.3) (end -4 2.6)
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp 98f96540-7a08-46eb-8f6d-772b75925f74))
+  (fp_line (start -4 3.3) (end -3.3 3.3)
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp 7f2834cc-dfd8-4e95-afaa-22343023a126))
+  (fp_line (start -3.8 -3.1) (end -3.8 3.1)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7775b4fb-9893-4e72-93d5-cc43905f3040))
+  (fp_line (start -3.8 3.1) (end 3.8 3.1)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d418b7e0-4885-4425-81a3-da57d1793a42))
+  (fp_line (start 3.8 -3.1) (end -3.8 -3.1)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c1dd353a-0e5a-4805-8b4a-ff14157dbaad))
+  (fp_line (start 3.8 3.1) (end 3.8 -3.1)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 256f134f-cb55-4b11-9d78-349665612621))
+  (fp_line (start -3.5 -2.5) (end 3.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 157aaec7-d931-4dbd-812b-06df82f569be))
+  (fp_line (start -3.5 1.5) (end -2.5 2.5)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fca6cd63-360d-43e2-b6e1-bf520f295711))
+  (fp_line (start -3.5 2.5) (end -3.5 -2.5)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 86957dcb-695b-4194-a6e1-58ee954abec5))
+  (fp_line (start 3.5 -2.5) (end 3.5 2.5)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp de7e38c9-de9a-4dc1-a3d5-01ed03869be0))
+  (fp_line (start 3.5 2.5) (end -3.5 2.5)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 40dfd52a-7272-4850-86db-a31db47e6a21))
+  (pad "1" smd roundrect (at -2.54 1.905) (size 2.2 2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp d8f20989-796c-42dd-9ed7-b63e1374c03c))
+  (pad "2" smd roundrect (at 2.54 1.905) (size 2.2 2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp 0703914d-62e6-4200-9530-5448ffbe4253))
+  (pad "3" smd roundrect (at 2.54 -1.905) (size 2.2 2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp 46da34bb-4480-4a82-b186-54a048809e26))
+  (pad "4" smd roundrect (at -2.54 -1.905) (size 2.2 2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp 91a67380-dff8-4fd5-99f9-b36eaaff4659))
+  (model "${KICAD6_3DMODEL_DIR}/Crystal.3dshapes/Crystal_SMD_3225-4Pin_3.2x2.5mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 2.1875 2 1.5))
     (rotate (xyz 0 0 0))
   )
diff --git a/D_SMA.kicad_mod b/D_SMA.kicad_mod
index 1a200e9..f875aa6 100644
--- a/D_SMA.kicad_mod
+++ b/D_SMA.kicad_mod
@@ -19,11 +19,11 @@
   )
   (fp_line (start -2.45 -1.65) (end -2.45 -1.05)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0269ab63-aca9-477b-a884-fc92e691cdce))
-  (fp_line (start -2.45 -1.65) (end 2 -1.65)
+  (fp_line (start -2.45 -1.65) (end -1.55 -1.65)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e4e6388a-191b-4c5c-81a0-d7005fcd8c86))
   (fp_line (start -2.45 1.05) (end -2.45 1.65)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7a2e7a37-0d94-405b-8b2d-cb8f2383c79b))
-  (fp_line (start -2.45 1.65) (end 2 1.65)
+  (fp_line (start -2.45 1.65) (end -1.55 1.65)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 695a591f-3b19-447c-be19-f62d1cf960a7))
   (fp_line (start -3.5 -1.75) (end 3.5 -1.75)
     (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 92319fcd-fa00-458e-a70d-4b59cfb90cb6))
diff --git a/D_SOD-123.kicad_mod b/D_SOD-123.kicad_mod
index 611dca7..27de1bf 100644
--- a/D_SOD-123.kicad_mod
+++ b/D_SOD-123.kicad_mod
@@ -18,9 +18,9 @@
   )
   (fp_line (start -2.35 -1) (end -2.35 1)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 67572692-5682-4248-b423-7937827de9dd))
-  (fp_line (start -2.35 -1) (end 1.65 -1)
+  (fp_line (start -2.35 -1) (end -1.35 -1)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bd9d2d2a-3215-4c7a-ae0e-d35f5d231e53))
-  (fp_line (start -2.35 1) (end 1.65 1)
+  (fp_line (start -2.35 1) (end -1.35 1)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 33902fd1-f406-4aa7-85d9-ad7ed03e2b07))
   (fp_line (start -2.45 -1.15) (end -2.45 1.15)
     (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c347841f-5914-4e75-ac42-1f02ad962365))
@@ -52,8 +52,8 @@
     (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7cfe9f4a-d6ca-4148-b1d2-300da35880a2))
   (fp_line (start 1.4 0.9) (end -1.4 0.9)
     (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 04fc5158-44c9-4bce-9f6d-809e97923ec7))
-  (pad "1" smd roundrect (at -1.55 0) (size 1.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fbfacc96-93c1-4311-b2b5-e12caecf4c54))
-  (pad "2" smd roundrect (at 1.55 0) (size 1.3 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3dc473d2-e73e-49b0-914a-4601dcb4f8ba))
+  (pad "1" smd roundrect (at -1.55 0) (size 1.3 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fbfacc96-93c1-4311-b2b5-e12caecf4c54))
+  (pad "2" smd roundrect (at 1.55 0) (size 1.3 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3dc473d2-e73e-49b0-914a-4601dcb4f8ba))
   (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
diff --git a/D_SOD-323.kicad_mod b/D_SOD-323.kicad_mod
index 9125206..80cfe3d 100644
--- a/D_SOD-323.kicad_mod
+++ b/D_SOD-323.kicad_mod
@@ -16,11 +16,11 @@
       (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
     (tstamp 413e7f91-ab1a-40c4-b296-4faf4ffa335a)
   )
-  (fp_line (start -1.85 -0.85) (end -1.85 0.85)
+  (fp_line (start -1.85 -0.7) (end -1.85 0.7)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5592c0a1-135a-4f90-a008-a21bb11c4e1d))
-  (fp_line (start -1.85 -0.85) (end 1.05 -0.85)
+  (fp_line (start -1.85 -0.7) (end -1.05 -0.7)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 581874a3-d109-41d5-b517-5487b77d84bc))
-  (fp_line (start -1.85 0.85) (end 1.05 0.85)
+  (fp_line (start -1.85 0.7) (end -1.05 0.7)
     (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6597c0e6-7e5f-4dcd-b808-9fa0d4bc2004))
   (fp_line (start -1.95 -1) (end -1.95 1)
     (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0cf337cd-98e8-45a9-9535-fc71bcf71e27))
diff --git a/Keystone_3034_2032.kicad_mod b/Keystone_3034_2032.kicad_mod
index 1cb3b4d..c4db367 100644
--- a/Keystone_3034_2032.kicad_mod
+++ b/Keystone_3034_2032.kicad_mod
@@ -15,30 +15,10 @@
       (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
     (tstamp 996f5bc7-bb5a-4343-96b0-02e5dcc2c6c9)
   )
-  (fp_line (start -10.78 -5.46) (end -10.78 -3)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 005b8a12-cd72-44b3-8dea-616d6a63142f))
   (fp_line (start -10.78 3) (end -10.78 3.63)
     (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 156216b8-d9a4-48a2-9b94-6f605914a3d0))
-  (fp_line (start -10.78 3.63) (end -9.34 7.58)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 6995f04b-8772-4d4c-9521-2e916277d8ef))
-  (fp_line (start -8.7 -7.54) (end -10.78 -5.46)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp a8cf5fd1-26b2-4f7b-b2c5-aceb09abd1f8))
-  (fp_line (start 8.7 -7.54) (end -8.7 -7.54)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp e5c34271-bc58-4f02-9905-211f5f4a59e5))
-  (fp_line (start 8.7 -7.54) (end 10.78 -5.46)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 5813f5f7-39ad-4248-b5d3-fe9379a14ea6))
-  (fp_line (start 10.78 -5.46) (end 10.78 -3)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp b1493156-108d-4d7f-9b35-224b3fb0ffd1))
   (fp_line (start 10.78 3) (end 10.78 3.63)
     (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 1f60973a-9085-41a5-9ffe-c69ffd4c18f2))
-  (fp_line (start 10.78 3.63) (end 9.34 7.58)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 6b0a762c-c5ce-43d6-a594-7db5ea896dae))
-  (fp_arc (start -6.0046 8.553536) (mid -0.002901 6.511341) (end 6 8.55)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 0f125801-bf57-4f17-a6e0-787942fd7599))
-  (fp_arc (start -6.003354 8.56653) (mid -7.921654 8.918738) (end -9.34 7.58)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp cb8cc59a-de45-45a5-9bb2-5ffcc129bffe))
-  (fp_arc (start 9.325243 7.588169) (mid 7.90634 8.911668) (end 6 8.55)
-    (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 504de502-d5d6-47ce-a6a6-1558187a2173))
   (fp_circle (center 0 0) (end 0 10.25)
     (stroke (width 0.15) (type solid)) (fill none) (layer "Dwgs.User") (tstamp aa0215d1-f4ae-4b1c-800a-4dd996da1746))
   (fp_line (start -11.938 -2.921) (end -11.938 2.921)
diff --git a/LED_0805.kicad_mod b/LED_0805.kicad_mod
index 2540a4c..c9fce01 100644
--- a/LED_0805.kicad_mod
+++ b/LED_0805.kicad_mod
@@ -1,32 +1,48 @@
-(module LED_0805 (layer F.Cu) (tedit 602BA8A8)
+(footprint "LED_0805" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
   (descr "LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags "diode")
   (attr smd)
-  (fp_text reference REF** (at 0 -0.2) (layer F.Fab)
-    (effects (font (size 0.254 0.254) (thickness 0.0635)))
+  (fp_text reference "REF**" (at 0 -0.2) (layer "F.Fab")
+      (effects (font (size 0.254 0.254) (thickness 0.0635)))
+    (tstamp 840fc291-385c-4a9a-98cd-0aa88dcb3f88)
   )
-  (fp_text value LED_0805 (at 0 0.2) (layer F.Fab)
-    (effects (font (size 0.254 0.254) (thickness 0.0635)))
+  (fp_text value "LED_0805" (at 0 0.2) (layer "F.Fab")
+      (effects (font (size 0.254 0.254) (thickness 0.0635)))
+    (tstamp eb4b9773-2329-4005-81fc-934260f7566e)
   )
-  (fp_line (start 1 -0.6) (end -0.7 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.7 -0.6) (end -1 -0.3) (layer F.Fab) (width 0.1))
-  (fp_line (start -1 -0.3) (end -1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1 0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 -0.96) (end -1.685 -0.96) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.685 -0.96) (end -1.685 0.96) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.685 0.96) (end 1 0.96) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer F.CrtYd) (width 0.05))
-  (fp_text user %R (at 0 -1.7) (layer F.SilkS)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text user "${REFERENCE}" (at 0 -1.7) (layer "F.SilkS")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp f671314a-b65d-422f-8257-b01825f22da8)
   )
-  (pad 1 smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (model ${KICAD6_3DMODEL_DIR}/LED_SMD.3dshapes/LED_0805_2012Metric.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -1.685 -0.95) (end -1.685 0.95)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1cfd7bb4-2b4d-4ab6-8403-02c5d128c549))
+  (fp_line (start -1.685 0.95) (end -0.95 0.95)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 012ae9dc-c0d6-4ec4-9840-31086ad2277b))
+  (fp_line (start -0.95 -0.95) (end -1.685 -0.95)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 84556b7f-e23c-445d-a775-32bfa20b3ed4))
+  (fp_line (start -1.68 -0.95) (end 1.68 -0.95)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 01539fab-84c1-4802-ad3a-f9a8fb7c2547))
+  (fp_line (start -1.68 0.95) (end -1.68 -0.95)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c3575b80-214a-4cfc-8051-7ec683fceb03))
+  (fp_line (start 1.68 -0.95) (end 1.68 0.95)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bb2be477-e515-4f60-b7f7-07a680369d75))
+  (fp_line (start 1.68 0.95) (end -1.68 0.95)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7b6494c5-58d2-4e2e-92ef-bcfdfa082331))
+  (fp_line (start -1 -0.3) (end -1 0.6)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp df2b048a-2b4e-4183-82a0-3770b3805c48))
+  (fp_line (start -1 0.6) (end 1 0.6)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 671c301f-03bc-4d1f-814c-b6df6d66b867))
+  (fp_line (start -0.7 -0.6) (end -1 -0.3)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3e1a4208-0cc3-477c-a019-5cd665edd9ae))
+  (fp_line (start 1 -0.6) (end -0.7 -0.6)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d6cb2e98-2919-44a7-b904-4618b83026a4))
+  (fp_line (start 1 0.6) (end 1 -0.6)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7295acd0-fdd7-4506-b6ab-d447d4781d6d))
+  (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c623c714-f197-4736-99db-4a98b90c7152))
+  (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 97a2917a-2840-44b6-bc9e-b3244e2cf33f))
+  (model "${KICAD6_3DMODEL_DIR}/LED_SMD.3dshapes/LED_0805_2012Metric.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )
diff --git a/SOIC-8_3.9mm.kicad_mod b/SOIC-8_3.9mm.kicad_mod
index 2e98692..2c84953 100644
--- a/SOIC-8_3.9mm.kicad_mod
+++ b/SOIC-8_3.9mm.kicad_mod
@@ -1,43 +1,63 @@
-(module SOIC-8_3.9mm (layer F.Cu) (tedit 609E3F9A)
-  (tags SOIC-8)
+(footprint "SOIC-8_3.9mm" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
+  (tags "SOIC-8")
   (solder_mask_margin 0.05)
   (solder_paste_margin -0.025)
   (attr smd)
-  (fp_text reference REF** (at 0 0 180) (layer F.Fab)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text reference "REF**" (at 0 0 180) (layer "F.Fab")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp faeb3970-9804-474e-acdd-a6e8a28be7ff)
   )
-  (fp_text value SOIC-8_3.9mm (at 0 -0.9 180) (layer F.Fab)
-    (effects (font (size 0.381 0.381) (thickness 0.09525)))
+  (fp_text value "SOIC-8_3.9mm" (at 0 -0.9 180) (layer "F.Fab")
+      (effects (font (size 0.381 0.381) (thickness 0.09525)))
+    (tstamp 39ae9e10-42ca-4d90-a6dd-3c9b628f841c)
   )
-  (fp_text user %R (at 0 0 180) (layer F.SilkS)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text user "${REFERENCE}" (at 0 0 180) (layer "F.SilkS")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp c608c3b5-2c0c-425b-828e-62c3f8dd6e71)
   )
-  (fp_line (start -2.45 0.95) (end -2.45 -1.95) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.45 -1.95) (end 2.45 -1.95) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.45 -1.95) (end 2.45 1.95) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.45 1.95) (end -1.45 1.95) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.45 1.95) (end -2.45 0.95) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.8 3.937) (end 2.8 3.937) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.8 -3.8735) (end 2.8 -3.8735) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.8 3.937) (end -2.8 -3.8735) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.8 3.937) (end 2.8 -3.8735) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.575 2.075) (end -2.525 2.075) (layer F.SilkS) (width 0.15))
-  (fp_line (start -2.575 -2.075) (end -2.43 -2.075) (layer F.SilkS) (width 0.15))
-  (fp_line (start 2.575 -2.075) (end 2.43 -2.075) (layer F.SilkS) (width 0.15))
-  (fp_line (start 2.575 2.075) (end 2.43 2.075) (layer F.SilkS) (width 0.15))
-  (fp_line (start -2.575 2.075) (end -2.575 -2.075) (layer F.SilkS) (width 0.15))
-  (fp_line (start 2.575 2.075) (end 2.575 -2.075) (layer F.SilkS) (width 0.15))
-  (fp_line (start -2.525 2.075) (end -2.525 3.475) (layer F.SilkS) (width 0.15))
-  (pad 1 smd roundrect (at -1.905 2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at -0.635 2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 3 smd roundrect (at 0.635 2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 4 smd roundrect (at 1.905 2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 5 smd roundrect (at 1.905 -2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at 0.635 -2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 7 smd roundrect (at -0.635 -2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 8 smd roundrect (at -1.905 -2.527 90) (size 2.1 0.7) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (model ${KICAD6_3DMODEL_DIR}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -2.575 -2.075) (end -2.43 -2.075)
+    (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 0b9fb180-eaf5-4114-a120-839c5ad32442))
+  (fp_line (start -2.575 2.075) (end -2.575 -2.075)
+    (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 583ac35c-9582-428e-ab56-8a9286a8bb7e))
+  (fp_line (start -2.575 2.075) (end -2.525 2.075)
+    (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 0875c40c-7e5d-468a-a591-9ce39a713dc3))
+  (fp_line (start -2.525 2.075) (end -2.525 3.475)
+    (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 3c8d3e16-eb5c-4d9b-965f-24a68394d9eb))
+  (fp_line (start 2.575 -2.075) (end 2.43 -2.075)
+    (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 3f6f19e7-e116-4576-b34c-b5b57dc1dc1a))
+  (fp_line (start 2.575 2.075) (end 2.43 2.075)
+    (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp de1102ad-fc59-4a9e-a2dd-7429d4bb75a7))
+  (fp_line (start 2.575 2.075) (end 2.575 -2.075)
+    (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 587364ed-4b07-4f7d-bb70-cb17f5ab2c3a))
+  (fp_line (start -2.8 -3.8735) (end 2.8 -3.8735)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a1ba366e-2336-4757-b621-17c4c82aad8c))
+  (fp_line (start -2.8 3.937) (end -2.8 -3.8735)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 098af72c-6946-4ebd-80fa-3ff4f3b44784))
+  (fp_line (start -2.8 3.937) (end 2.8 3.937)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2f60a752-f220-4b99-a6fa-d05feb4d9e9e))
+  (fp_line (start 2.8 3.937) (end 2.8 -3.8735)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f73b3df0-f5c6-4d11-bdeb-da306cd94b64))
+  (fp_line (start -2.45 -1.95) (end 2.45 -1.95)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b52a447d-1e2e-4281-94e3-abec6feaf280))
+  (fp_line (start -2.45 0.95) (end -2.45 -1.95)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7c60864f-bc58-4c28-a6ec-591c4c143837))
+  (fp_line (start -1.45 1.95) (end -2.45 0.95)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 69497fa6-f757-4cb0-a398-62650b8f8e18))
+  (fp_line (start 2.45 -1.95) (end 2.45 1.95)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f6f2c035-accb-4c01-9e79-5055e3fbf4a6))
+  (fp_line (start 2.45 1.95) (end -1.45 1.95)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 98542858-46ae-47b9-b76a-493b91ca421a))
+  (pad "1" smd roundrect (at -1.905 2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 6eea70a1-2b6c-4d6c-9c64-3fa3ca8d33e5))
+  (pad "2" smd roundrect (at -0.635 2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 505716e4-04ff-4975-89eb-b31ee7007b75))
+  (pad "3" smd roundrect (at 0.635 2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 3c7b4ad3-25d2-417a-89b7-4d4f8d4f3557))
+  (pad "4" smd roundrect (at 1.905 2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp fa30eed5-7f4a-4371-b561-e133028f8a13))
+  (pad "5" smd roundrect (at 1.905 -2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e06ebe60-3d81-43ee-b225-28b0334a56bc))
+  (pad "6" smd roundrect (at 0.635 -2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 917f4f31-5ca3-42b9-9e03-d526764850de))
+  (pad "7" smd roundrect (at -0.635 -2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b67f80b9-4723-4aa5-8246-5aff87b42291))
+  (pad "8" smd roundrect (at -1.905 -2.527 90) (size 2.1 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4b214322-6e4f-40f2-ac77-e0acc5576796))
+  (model "${KICAD6_3DMODEL_DIR}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 -90))
   )
diff --git a/SOT-223.kicad_mod b/SOT-223.kicad_mod
index a6a2c35..2dac8c3 100644
--- a/SOT-223.kicad_mod
+++ b/SOT-223.kicad_mod
@@ -1,41 +1,62 @@
-(module SOT-223 (layer F.Cu) (tedit 608E59D1)
+(footprint "SOT-223" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
   (descr "module CMS SOT223 4 pins")
   (tags "CMS SOT")
   (solder_mask_margin 0.05)
   (solder_paste_margin -0.05)
   (attr smd)
-  (fp_text reference REF** (at 0 0 270) (layer F.SilkS)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text reference "REF**" (at 0 0 270) (layer "F.Fab")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp 82bf46a8-4824-48e4-91b2-30888d52731a)
   )
-  (fp_text value SOT-223 (at 1.016 0 270) (layer F.Fab)
-    (effects (font (size 0.381 0.381) (thickness 0.09525)))
+  (fp_text value "SOT-223" (at 1.016 0 270) (layer "F.Fab")
+      (effects (font (size 0.381 0.381) (thickness 0.09525)))
+    (tstamp 841362a4-d3b6-47db-922b-6fe465ea8759)
   )
-  (fp_line (start -2.1 -2.15) (end -4.4 -2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.1 -3.6) (end -2.1 -2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.1 2.15) (end -4.4 2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.1 2.15) (end -2.1 3.6) (layer F.CrtYd) (width 0.05))
-  (fp_text user %R (at 0 0 270) (layer F.Fab)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text user "${REFERENCE}" (at 0 0 270) (layer "F.SilkS")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp 5a557666-0511-4867-a553-c75ac8fbf704)
   )
-  (fp_line (start -1.91 -3.41) (end -1.91 -2.15) (layer F.SilkS) (width 0.1524))
-  (fp_line (start -1.91 3.41) (end -1.91 2.15) (layer F.SilkS) (width 0.1524))
-  (fp_line (start -2.1 3.6) (end 4.4 3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.4 -2.15) (end -4.4 2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.4 -3.6) (end -2.1 -3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.4 3.6) (end 4.4 -3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.85 2.35) (end 0.85 3.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.85 2.35) (end 1.85 -3.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.85 -3.41) (end -1.91 -3.41) (layer F.SilkS) (width 0.1524))
-  (fp_line (start 0.85 3.35) (end -1.85 3.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 4.1 3.41) (end -1.91 3.41) (layer F.SilkS) (width 0.1524))
-  (fp_line (start 1.85 -3.35) (end -1.85 -3.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.85 3.35) (end -1.85 -3.35) (layer F.Fab) (width 0.1))
-  (pad 2 smd roundrect (at -3.15 0 180) (size 2 3.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15))
-  (pad 2 smd roundrect (at 3.15 0 180) (size 2 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.2))
-  (pad 3 smd roundrect (at 3.15 -2.3 180) (size 2 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.2))
-  (pad 1 smd roundrect (at 3.15 2.3 180) (size 2 1.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.2))
-  (model ${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-223.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -1.91 -3.41) (end -1.91 -2.15)
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp 123f1daf-0c24-43f2-b56c-a274b441dc8f))
+  (fp_line (start -1.91 3.41) (end -1.91 2.15)
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp 137046bc-a87e-4777-8805-3878c1d48ff2))
+  (fp_line (start 1.85 -3.41) (end -1.91 -3.41)
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp d5171f9d-23da-429d-8ef1-209743c9054e))
+  (fp_line (start 4.1 3.41) (end -1.91 3.41)
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp 1d8a5f1e-d117-4054-a428-ebc397a6d7ce))
+  (fp_line (start -4.4 -2.15) (end -4.4 2.15)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0373dc56-cda4-48b3-9089-a477f5487597))
+  (fp_line (start -2.1 -3.6) (end -2.1 -2.15)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 61213dc1-17d9-4777-931e-61c17031c459))
+  (fp_line (start -2.1 -2.15) (end -4.4 -2.15)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ba61cd4d-5781-46da-afe0-01bbaf9bc18a))
+  (fp_line (start -2.1 2.15) (end -4.4 2.15)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 59b3ee62-71e9-4f5a-be53-c313c0071386))
+  (fp_line (start -2.1 2.15) (end -2.1 3.6)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4f64a670-c29a-4a9c-9fa4-05987e227034))
+  (fp_line (start -2.1 3.6) (end 4.4 3.6)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bae66c87-4fc6-4557-bd54-56d860fe9b57))
+  (fp_line (start 4.4 -3.6) (end -2.1 -3.6)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp aa20ffa5-6452-4369-aa0c-19e707c08ba7))
+  (fp_line (start 4.4 3.6) (end 4.4 -3.6)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a93221cf-12cc-4e5b-a60f-e143bf15dfc5))
+  (fp_line (start -1.85 3.35) (end -1.85 -3.35)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b5d1fd6f-a363-46d0-b80a-08ebaae62e56))
+  (fp_line (start 0.85 3.35) (end -1.85 3.35)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4bf5844b-ffdb-4f53-ba70-dfd17b490e6a))
+  (fp_line (start 1.85 -3.35) (end -1.85 -3.35)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cea3ddd9-6715-4b90-b82b-9c64df70dcf2))
+  (fp_line (start 1.85 2.35) (end 0.85 3.35)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 35f78b90-7aa5-4e5a-ad0a-b4e4b6b2148b))
+  (fp_line (start 1.85 2.35) (end 1.85 -3.35)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp eddcaaa6-7937-40d0-89ab-39024a3880fd))
+  (pad "1" smd roundrect (at 3.15 2.3 180) (size 2 1.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) (tstamp 326f6356-1a95-4c06-9e4f-434971c4c7b9))
+  (pad "2" smd roundrect (at -3.15 0 180) (size 2 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp 0a3236a9-2102-4162-abd2-36f8bb34e2c7))
+  (pad "2" smd roundrect (at 3.15 0 180) (size 2 1.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) (tstamp cd2d17b6-1d31-460f-ab12-2f110f375196))
+  (pad "3" smd roundrect (at 3.15 -2.3 180) (size 2 1.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) (tstamp 007f65e2-50d1-4765-85f1-7fe73dd5e075))
+  (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-223.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 180))
   )
diff --git a/SOT-23-5.kicad_mod b/SOT-23-5.kicad_mod
index 0859308..52cb1ad 100644
--- a/SOT-23-5.kicad_mod
+++ b/SOT-23-5.kicad_mod
@@ -16,10 +16,10 @@
       (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
     (tstamp 4bed5832-d90e-4608-82d2-c8740201077c)
   )
-  (fp_line (start -1.58 -0.76) (end -1.58 1.4)
-    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3d1869e7-d5b4-42d2-9905-ec0f6a9f9b05))
+  (fp_line (start -1.58 -0.76) (end -1.58 1.5)
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp 3d1869e7-d5b4-42d2-9905-ec0f6a9f9b05))
   (fp_line (start 1.58 -0.76) (end 1.58 0.7)
-    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a8a7df8a-1dc8-4cf7-8aa5-37f393006f5f))
+    (stroke (width 0.1524) (type solid)) (layer "F.SilkS") (tstamp a8a7df8a-1dc8-4cf7-8aa5-37f393006f5f))
   (fp_line (start -1.8 -2) (end 1.8 -2)
     (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c7ca9e83-ee0c-46e1-870b-e30c8a813e03))
   (fp_line (start -1.8 2) (end -1.8 -2)
diff --git a/SOT-23-6.kicad_mod b/SOT-23-6.kicad_mod
index 312f171..3578dc6 100644
--- a/SOT-23-6.kicad_mod
+++ b/SOT-23-6.kicad_mod
@@ -1,36 +1,51 @@
-(module SOT-23-6 (layer F.Cu) (tedit 5EEAE2CC)
-  (tags SOT-23-6)
+(footprint "SOT-23-6" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
+  (tags "SOT-23-6")
   (solder_mask_margin 0.05)
   (solder_paste_margin -0.05)
   (attr smd)
-  (fp_text reference REF** (at 0 0 90) (layer F.Fab)
-    (effects (font (size 0.254 0.254) (thickness 0.0635)))
+  (fp_text reference "REF**" (at 0 0 90) (layer "F.Fab")
+      (effects (font (size 0.254 0.254) (thickness 0.0635)))
+    (tstamp ee1b9910-e666-423e-84e2-0e293a2117ad)
   )
-  (fp_text value SOT-23-6 (at 0 1.35) (layer F.Fab)
-    (effects (font (size 0.127 0.127) (thickness 0.03175)))
+  (fp_text value "SOT-23-6" (at 0 1.35) (layer "F.Fab")
+      (effects (font (size 0.127 0.127) (thickness 0.03175)))
+    (tstamp 4b4f789e-0715-46ab-9ac2-f1bca229a276)
   )
-  (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2 1.8) (end -2 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2 1.8) (end -2 1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2 -1.8) (end 2 1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2 -1.8) (end 2 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-  (fp_text user %R (at 0 -2.35 180) (layer F.SilkS)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text user "${REFERENCE}" (at 0 -2.35 180) (layer "F.SilkS")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp 3d4c6183-cccd-42e0-abe7-763c2c7ce63f)
   )
-  (pad 4 smd roundrect (at 1.05 0.95) (size 1.35 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at 1.05 -0.95) (size 1.35 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at -1.05 0) (size 1.35 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 5 smd roundrect (at 1.05 0) (size 1.35 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 3 smd roundrect (at -1.05 0.95) (size 1.35 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -1.05 -0.95) (size 1.35 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (model ${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23-6.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 0.76 -1.58) (end -1.5 -1.58)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e86bb9c4-68d7-4b9c-9dc1-36b37187b113))
+  (fp_line (start 0.76 1.58) (end -0.7 1.58)
+    (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 77765645-5e2f-4ca0-a510-6fc52c047315))
+  (fp_line (start -2 -1.8) (end 2 -1.8)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 30ea753e-ceac-4acc-87b7-faef0e781751))
+  (fp_line (start -2 1.8) (end -2 -1.8)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1b489b43-280e-4426-9f0b-06744faba45b))
+  (fp_line (start 2 -1.8) (end 2 1.8)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 93f4cdf0-bfa4-4547-a981-e16e73674c34))
+  (fp_line (start 2 1.8) (end -2 1.8)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 12e7631f-0f7d-41e2-9b7e-13bf0438ef82))
+  (fp_line (start -0.7 -0.95) (end -0.7 1.5)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2ac774d0-ca45-4314-837b-9c3089959ebd))
+  (fp_line (start -0.7 -0.95) (end -0.15 -1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 94e3fb38-ea1a-44c3-9d72-3791bcd19dae))
+  (fp_line (start -0.7 1.52) (end 0.7 1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 620d177f-6c16-40c4-88b9-a3023665086c))
+  (fp_line (start -0.15 -1.52) (end 0.7 -1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2c8fb258-9f37-475b-926a-7797fbe57827))
+  (fp_line (start 0.7 -1.52) (end 0.7 1.52)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a550f3d2-ab66-4f99-abd5-cc4b7e8477f5))
+  (pad "1" smd roundrect (at -1.05 -0.95) (size 1.35 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 7d9e0c0b-6a2f-4b48-a4a9-b3980b20973e))
+  (pad "2" smd roundrect (at -1.05 0) (size 1.35 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 83e3f078-b476-4051-9ca8-88a0c1107378))
+  (pad "3" smd roundrect (at -1.05 0.95) (size 1.35 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 00974478-c6b9-41a7-8bd9-20ca2395df27))
+  (pad "4" smd roundrect (at 1.05 0.95) (size 1.35 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9d6dc078-85b6-41e1-9eda-b68f6f8086e3))
+  (pad "5" smd roundrect (at 1.05 0) (size 1.35 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 4aa9fe3c-bb9b-4514-9f9b-c9d12bd72cbf))
+  (pad "6" smd roundrect (at 1.05 -0.95) (size 1.35 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp df58dc4f-1b0f-440f-ae92-9544a3e59f46))
+  (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23-6.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )
diff --git a/USB_Micro-B_Amphenol_10118192-0001.kicad_mod b/USB_Micro-B_Amphenol_10118192-0001.kicad_mod
index 960a67d..ec6ca94 100644
--- a/USB_Micro-B_Amphenol_10118192-0001.kicad_mod
+++ b/USB_Micro-B_Amphenol_10118192-0001.kicad_mod
@@ -1,48 +1,62 @@
-(module USB_Micro-B_Amphenol_10118192-0001 (layer F.Cu) (tedit 5F027735)
+(footprint "USB_Micro-B_Amphenol_10118192-0001" (version 20221018) (generator pcbnew)
+  (layer "F.Cu")
   (descr "Micro USB B receptable with flange, bottom-mount, SMD, right-angle (http://www.molex.com/pdm_docs/sd/473460001_sd.pdf)")
   (tags "Micro B USB SMD")
   (solder_mask_margin 0.05)
   (solder_paste_margin -0.025)
   (attr smd)
-  (fp_text reference REF** (at 0 0 90) (layer F.Fab)
-    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  (fp_text reference "REF**" (at 0 0.55 90) (layer "F.Fab")
+      (effects (font (size 0.508 0.508) (thickness 0.127)))
+    (tstamp 40d13505-0db2-4e51-b232-b22060ff29a9)
   )
-  (fp_text value USB_Micro-B_Amphenol_10118192-0001 (at 0 3.302 180) (layer F.Fab)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text value "USB_Micro-B_Amphenol_10118192-0001" (at 0 3.852 180) (layer "F.Fab")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp da4b2c4d-f8ea-410b-b189-7d84c1fc0682)
   )
-  (fp_line (start -3.25 1.45) (end 3.25 1.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.95 2.2) (end -3.95 -3.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.95 -3.35) (end 3.95 -3.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.95 -3.35) (end 3.95 2.2) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.95 2.2) (end -3.95 2.2) (layer F.Fab) (width 0.1))
-  (fp_line (start -5 2.7) (end -5 -3.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -5 -3.9) (end 5 -3.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 5 -3.9) (end 5 2.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 5 2.7) (end -5 2.7) (layer F.CrtYd) (width 0.05))
-  (fp_text user %R (at 0 -4.45 180) (layer F.SilkS)
-    (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+  (fp_text user "${REFERENCE}" (at 0 -3.9 180) (layer "F.SilkS")
+      (effects (font (size 0.8128 0.8128) (thickness 0.2032)))
+    (tstamp 3c5e2cb4-d777-4c04-b905-dd782958c61b)
   )
-  (fp_text user "PCB Edge" (at 0 1.47 180) (layer Dwgs.User)
-    (effects (font (size 0.4 0.4) (thickness 0.04)))
+  (fp_text user "PCB Edge" (at 0 2.02 180) (layer "Dwgs.User")
+      (effects (font (size 0.4 0.4) (thickness 0.04)))
+    (tstamp 335f0fab-5f90-489b-9ade-7d8c7fa40865)
   )
-  (pad 6 smd roundrect (at 1.2 0) (size 1.9 1.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at -1.2 0) (size 1.9 1.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at 3.8 0) (size 1.8 1.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at -3.8 0) (size 1.8 1.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at 3.1 -2.55) (size 2.1 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at -3.1 -2.55) (size 2.1 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 5 smd roundrect (at 1.3 -2.675) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-    (solder_mask_margin 0.04) (solder_paste_margin -0.05))
-  (pad 4 smd roundrect (at 0.65 -2.675) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-    (solder_mask_margin 0.04) (solder_paste_margin -0.04))
-  (pad 3 smd roundrect (at 0 -2.675) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-    (solder_mask_margin 0.04) (solder_paste_margin -0.04))
-  (pad 2 smd roundrect (at -0.65 -2.675) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-    (solder_mask_margin 0.04) (solder_paste_margin -0.04))
-  (pad 1 smd roundrect (at -1.3 -2.675) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-    (solder_mask_margin 0.04) (solder_paste_margin -0.04))
-  (model ${KICAD6_3DMODEL_DIR}/Connector_USB.3dshapes/USB_Micro-B_Molex_47346-0001.wrl
-    (offset (xyz 0 1.5 0))
+  (fp_line (start -5 -3.35) (end 5 -3.35)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ff4c8fc3-0b08-4c49-9e82-af3ae3b3a96a))
+  (fp_line (start -5 3.25) (end -5 -3.35)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7187d18f-6622-49af-ab0b-30fcb2f22ece))
+  (fp_line (start 5 -3.35) (end 5 3.25)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d4d80803-ba9e-490f-8547-afe335e36893))
+  (fp_line (start 5 3.25) (end -5 3.25)
+    (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d881b934-0da4-4d5e-9a5c-320197b37ca6))
+  (fp_line (start -3.95 -2.8) (end 3.95 -2.8)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3e60ee78-16cc-4ec0-86a2-d0c87dd17cc8))
+  (fp_line (start -3.95 2.75) (end -3.95 -2.8)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3ad9f65f-2d2e-42c2-8644-1d36d9774575))
+  (fp_line (start -3.25 2) (end 3.25 2)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 173d84a7-7350-488a-b7de-21708c727c1b))
+  (fp_line (start 3.95 -2.8) (end 3.95 2.75)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 43391309-2a64-46ed-9a79-a1c69fc3228f))
+  (fp_line (start 3.95 2.75) (end -3.95 2.75)
+    (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 22a946f6-e8e1-4892-991c-278c92bf1420))
+  (pad "1" smd roundrect (at -1.3 -2.125) (size 0.4 1.35) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (solder_mask_margin 0.04) (solder_paste_margin -0.04) (tstamp ea270f78-a905-4728-b2f1-f646ea5aece4))
+  (pad "2" smd roundrect (at -0.65 -2.125) (size 0.4 1.35) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (solder_mask_margin 0.04) (solder_paste_margin -0.04) (tstamp f3809207-66fc-45ee-a709-df76fa104d92))
+  (pad "3" smd roundrect (at 0 -2.125) (size 0.4 1.35) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (solder_mask_margin 0.04) (solder_paste_margin -0.04) (tstamp 2a562c1b-7eab-4a46-82ea-ef7e90348868))
+  (pad "4" smd roundrect (at 0.65 -2.125) (size 0.4 1.35) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (solder_mask_margin 0.04) (solder_paste_margin -0.04) (tstamp c409ede5-d450-437e-bc41-ee25c77a7bf9))
+  (pad "5" smd roundrect (at 1.3 -2.125) (size 0.4 1.35) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (solder_mask_margin 0.04) (solder_paste_margin -0.05) (tstamp 18b25781-2299-4f36-ac82-18e697044a51))
+  (pad "6" smd roundrect (at -3.8 0.55) (size 1.8 1.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 16a4f994-26f5-44ef-96f6-84bfbdc0607d))
+  (pad "6" smd roundrect (at -3.1 -2) (size 2.1 1.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp b7bcda8b-f02b-42d6-bc19-a06c30f0304f))
+  (pad "6" smd roundrect (at -1.2 0.55) (size 1.9 1.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 547034ec-583e-46e0-b053-63b1382dfef4))
+  (pad "6" smd roundrect (at 1.2 0.55) (size 1.9 1.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp c535f3c1-d0fb-4044-a9e4-f9dae44d2923))
+  (pad "6" smd roundrect (at 3.1 -2) (size 2.1 1.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 926f745a-d456-4e82-8660-53293cef3182))
+  (pad "6" smd roundrect (at 3.8 0.55) (size 1.8 1.9) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp e5e7fca3-82fa-4070-8cd3-b2d4257242c6))
+  (model "${KICAD6_3DMODEL_DIR}/Connector_USB.3dshapes/USB_Micro-B_Molex_47346-0001.wrl"
+    (offset (xyz 0 0.95 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )