Save every single footprint using kicad v6

Audio_Module.pretty/Reverb_BTDR-1H.kicad_mod

@@ -1,63 +1,69 @@
-(module Reverb_BTDR-1H (layer F.Cu) (tedit 5F6F0B02)
+(footprint "Reverb_BTDR-1H" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5F6F0B02)
   (descr "Digital Reverberation Unit, http://www.belton.co.kr/inc/downfile.php?seq=17&file=pdf (footprint from http://www.uk-electronic.de/PDF/BTDR-1.pdf)")
   (tags "audio belton reverb")
-  (fp_text reference REF** (at -3.5 -36) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -3.5 -36) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 7cdb7b63-0cb3-45a2-ae96-1469165f97de)
   )
-  (fp_text value Reverb_BTDR-1H (at 29 6) (layer F.Fab)
+  (fp_text value "Reverb_BTDR-1H" (at 29 6) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp bcad93d1-648a-41e5-ae58-8359241c25a7)
   )
-  (fp_line (start -6.63 4.25) (end -6.63 -8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 61.87 4.25) (end -6.63 4.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 69.37 -23) (end 69.37 -8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -6.63 -35.25) (end 61.87 -35.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.13 -8) (end -14.13 -23) (layer F.CrtYd) (width 0.05))
-  (fp_text user %R (at 29 -15.5) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 29 -15.5) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 52ebdf49-edd8-4f61-99ae-54eb5b8f937d)
   )
-  (fp_line (start -6.38 -23) (end -6.38 -35) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.38 4) (end 61.62 4) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.38 -35) (end 61.62 -35) (layer F.Fab) (width 0.1))
-  (fp_line (start 61.62 -35) (end 61.62 -23) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.38 -8) (end -6.38 4) (layer F.Fab) (width 0.1))
-  (fp_circle (center -9.38 -15.5) (end -7.63 -15.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.38 -15.5) (end -6.38 -35) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.38 -15.5) (end -6.38 4) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.38 4) (end 61.62 4) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.38 -35) (end 61.62 -35) (layer F.SilkS) (width 0.12))
-  (fp_line (start 61.62 -35) (end 61.62 4) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -9.38 -15.5) (end -9.38 -20) (angle -180) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -9.38 -23) (end -9.38 -20) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -9.38 -8) (end -6.38 -8) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 64.62 -15.5) (end 64.62 -11) (angle -180) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 64.62 -8) (end 64.62 -11) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 64.62 -23) (end 61.62 -23) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_circle (center 64.62 -15.5) (end 66.37 -15.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 64.62 -23) (end 61.62 -23) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 64.62 -15.5) (end 64.62 -11) (angle -180) (layer F.Fab) (width 0.1))
-  (fp_arc (start 64.62 -8) (end 64.62 -11) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_arc (start -9.38 -23) (end -9.38 -20) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_arc (start -9.38 -15.5) (end -9.38 -20) (angle -180) (layer F.Fab) (width 0.1))
-  (fp_arc (start -9.38 -8) (end -6.38 -8) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_line (start 61.62 -8) (end 61.62 4) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.63 -35.25) (end -6.63 -23) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -6.63 -23) (end -14.13 -23) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -6.63 -8) (end -14.13 -8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 61.87 -35.25) (end 61.87 -23) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 69.37 -23) (end 61.87 -23) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 69.37 -8) (end 61.87 -8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 61.87 4.25) (end 61.87 -8) (layer F.CrtYd) (width 0.05))
-  (pad "" np_thru_hole circle (at -9.38 -15.5) (size 3.7 3.7) (drill 3.7) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 64.62 -15.5) (size 3.7 3.7) (drill 3.7) (layers *.Cu *.Mask))
-  (pad 4 thru_hole circle (at 7.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 3 thru_hole circle (at 5.08 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 2.54 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 5 thru_hole circle (at 50.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 6 thru_hole circle (at 53.16 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 7 thru_hole circle (at 55.7 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Audio_Module.3dshapes/Reverb_BTDR-1H.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -6.38 -15.5) (end -6.38 -35) (layer "F.SilkS") (width 0.12) (tstamp 1447f2d7-77d5-417d-ab18-c865cb322f17))
+  (fp_line (start -6.38 -35) (end 61.62 -35) (layer "F.SilkS") (width 0.12) (tstamp 2e696190-d0be-445e-b040-877485973888))
+  (fp_line (start 61.62 -35) (end 61.62 4) (layer "F.SilkS") (width 0.12) (tstamp 36a38440-74a0-4757-9b90-2cec42888eb4))
+  (fp_line (start -6.38 -15.5) (end -6.38 4) (layer "F.SilkS") (width 0.12) (tstamp 3d7a1abc-965c-4805-b774-8e2f9f533798))
+  (fp_line (start -6.38 4) (end 61.62 4) (layer "F.SilkS") (width 0.12) (tstamp 734c024b-7d9e-47ca-9326-e33362584c07))
+  (fp_arc (start 64.62 -20) (mid 62.49868 -20.87868) (end 61.62 -23) (layer "F.SilkS") (width 0.12) (tstamp 467af74c-22d0-40ef-b95d-ca1c1b0de954))
+  (fp_arc (start -6.38 -23) (mid -7.25868 -20.87868) (end -9.38 -20) (layer "F.SilkS") (width 0.12) (tstamp 4e2eadd7-f3da-40c6-9548-aa05bf04e18f))
+  (fp_arc (start 61.62 -8) (mid 62.49868 -10.12132) (end 64.62 -11) (layer "F.SilkS") (width 0.12) (tstamp 7381b995-c5cc-4218-84dd-25ce4d27b516))
+  (fp_arc (start 64.62 -20) (mid 69.12 -15.5) (end 64.62 -11) (layer "F.SilkS") (width 0.12) (tstamp 9c5d7535-3124-47a2-bc9d-48670abc6c38))
+  (fp_arc (start -9.38 -11) (mid -13.88 -15.5) (end -9.38 -20) (layer "F.SilkS") (width 0.12) (tstamp c5cefae7-2deb-4c90-80c9-f770bde55997))
+  (fp_arc (start -9.38 -11) (mid -7.25868 -10.12132) (end -6.38 -8) (layer "F.SilkS") (width 0.12) (tstamp fa015d22-cacc-4f2b-bc14-e3a1bae3f87d))
+  (fp_circle (center 64.62 -15.5) (end 66.37 -15.5) (layer "F.SilkS") (width 0.12) (fill none) (tstamp bd91c901-a14c-4532-9122-335067216759))
+  (fp_circle (center -9.38 -15.5) (end -7.63 -15.5) (layer "F.SilkS") (width 0.12) (fill none) (tstamp e42833fa-546d-45e9-8ed9-74d671ecf018))
+  (fp_line (start -6.63 4.25) (end -6.63 -8) (layer "F.CrtYd") (width 0.05) (tstamp 16535100-a5f0-4adb-a3ab-bfaa692cb168))
+  (fp_line (start -6.63 -35.25) (end -6.63 -23) (layer "F.CrtYd") (width 0.05) (tstamp 2050ec4d-ebad-44a4-8d8d-132505e5944c))
+  (fp_line (start 61.87 4.25) (end 61.87 -8) (layer "F.CrtYd") (width 0.05) (tstamp 26c18d95-2642-4cab-8b09-a2cc943d3052))
+  (fp_line (start 61.87 4.25) (end -6.63 4.25) (layer "F.CrtYd") (width 0.05) (tstamp 46441d50-0e7a-4243-912c-40991a57a99f))
+  (fp_line (start 69.37 -23) (end 69.37 -8) (layer "F.CrtYd") (width 0.05) (tstamp 5ae99071-973b-4fec-b0e9-a0ff46aef2b5))
+  (fp_line (start 61.87 -35.25) (end 61.87 -23) (layer "F.CrtYd") (width 0.05) (tstamp 6d4e0fb4-c9d5-459e-b136-3ad60050fd7a))
+  (fp_line (start -6.63 -8) (end -14.13 -8) (layer "F.CrtYd") (width 0.05) (tstamp 768c9770-9ae4-44e8-a9eb-66ab457503ad))
+  (fp_line (start 69.37 -8) (end 61.87 -8) (layer "F.CrtYd") (width 0.05) (tstamp 7b1bac6e-0e78-402b-b64d-84979a68b1ca))
+  (fp_line (start -14.13 -8) (end -14.13 -23) (layer "F.CrtYd") (width 0.05) (tstamp 99af4f18-39b8-4f71-a04a-2d634aa59d51))
+  (fp_line (start 69.37 -23) (end 61.87 -23) (layer "F.CrtYd") (width 0.05) (tstamp a6a76e18-cdb0-4ec1-8516-6ee2e0dbdbd8))
+  (fp_line (start -6.63 -23) (end -14.13 -23) (layer "F.CrtYd") (width 0.05) (tstamp bb6aae81-30b9-4dcf-8667-a8370e203d04))
+  (fp_line (start -6.63 -35.25) (end 61.87 -35.25) (layer "F.CrtYd") (width 0.05) (tstamp feaeab61-6c75-4a0b-95f1-18fdc96a3f43))
+  (fp_line (start -6.38 -35) (end 61.62 -35) (layer "F.Fab") (width 0.1) (tstamp 0ee9b48e-7898-4198-b01c-41582bd5ab6b))
+  (fp_line (start 61.62 -35) (end 61.62 -23) (layer "F.Fab") (width 0.1) (tstamp 97cb5c03-3216-4880-9950-ef80cc3f137f))
+  (fp_line (start 61.62 -8) (end 61.62 4) (layer "F.Fab") (width 0.1) (tstamp c335b02f-3f36-426f-8b8e-d4e956033d8a))
+  (fp_line (start -6.38 -8) (end -6.38 4) (layer "F.Fab") (width 0.1) (tstamp d0245a4b-8785-4825-b7de-8b911d222458))
+  (fp_line (start -6.38 4) (end 61.62 4) (layer "F.Fab") (width 0.1) (tstamp dca6453b-bc47-4f5c-86fa-d8dbbec1b253))
+  (fp_line (start -6.38 -23) (end -6.38 -35) (layer "F.Fab") (width 0.1) (tstamp fe04d0bf-0fc5-4e6c-8349-bc3c0d487af3))
+  (fp_arc (start -9.38 -11) (mid -13.88 -15.5) (end -9.38 -20) (layer "F.Fab") (width 0.1) (tstamp 41d82ce0-459b-41e6-ab70-9bf06ce005a3))
+  (fp_arc (start -9.38 -11) (mid -7.25868 -10.12132) (end -6.38 -8) (layer "F.Fab") (width 0.1) (tstamp 503b595f-6175-4c99-90ab-41086c1e234a))
+  (fp_arc (start -6.38 -23) (mid -7.25868 -20.87868) (end -9.38 -20) (layer "F.Fab") (width 0.1) (tstamp 57f10b88-9d05-41bb-bf04-fd7fc783bd9c))
+  (fp_arc (start 64.62 -20) (mid 62.49868 -20.87868) (end 61.62 -23) (layer "F.Fab") (width 0.1) (tstamp 8a0c7a36-1aad-4fa5-a996-d8ea3ee411c3))
+  (fp_arc (start 64.62 -20) (mid 69.12 -15.5) (end 64.62 -11) (layer "F.Fab") (width 0.1) (tstamp 909b9d53-4442-4583-8d57-4d3290ad3d1b))
+  (fp_arc (start 61.62 -8) (mid 62.49868 -10.12132) (end 64.62 -11) (layer "F.Fab") (width 0.1) (tstamp f31d0833-f556-4322-8c4f-01aea4bf7f74))
+  (pad "" np_thru_hole circle (at -9.38 -15.5) (size 3.7 3.7) (drill 3.7) (layers *.Cu *.Mask) (tstamp 2349fd91-21ce-4699-839f-8c5d9e33ef66))
+  (pad "" np_thru_hole circle (at 64.62 -15.5) (size 3.7 3.7) (drill 3.7) (layers *.Cu *.Mask) (tstamp d4aa3128-2f66-42c6-af98-3b0b98648fd4))
+  (pad "1" thru_hole rect (at 0 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp ed7b829f-946b-434f-a202-e156fe747536))
+  (pad "2" thru_hole circle (at 2.54 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 23212f40-7e35-497e-b4f6-361d0afbf46b))
+  (pad "3" thru_hole circle (at 5.08 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp ec24dd0f-6c9d-4b9e-ab5d-83ecf66553eb))
+  (pad "4" thru_hole circle (at 7.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp ba6cf24e-3fac-4e7f-b5a3-97e8d8fe544a))
+  (pad "5" thru_hole circle (at 50.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 29623ed8-4759-4d5d-b485-669682b5f700))
+  (pad "6" thru_hole circle (at 53.16 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 00c8f175-e115-4451-a08b-92a849971865))
+  (pad "7" thru_hole circle (at 55.7 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 19b0b7d2-a9ef-4348-ac7b-39e6b5d6d102))
+  (model "${KICAD6_3DMODEL_DIR}/Audio_Module.3dshapes/Reverb_BTDR-1H.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Audio_Module.pretty/Reverb_BTDR-1V.kicad_mod

@@ -1,46 +1,52 @@
-(module Reverb_BTDR-1V (layer F.Cu) (tedit 5F6F0E2D)
+(footprint "Reverb_BTDR-1V" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5F6F0E2D)
   (descr "Digital Reverberation Unit, http://www.belton.co.kr/inc/downfile.php?seq=17&file=pdf (footprint from http://www.uk-electronic.de/PDF/BTDR-1.pdf)")
   (tags "audio belton reverb")
-  (fp_text reference REF** (at -11.5 0 180) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -11.5 0 180) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 23fd8612-0682-410f-bf8d-c4874ad45f3d)
   )
-  (fp_text value Reverb_BTDR-1V (at 27.62 -2.75 180) (layer F.Fab)
+  (fp_text value "Reverb_BTDR-1V" (at 27.62 -2.75 180) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 84aa1724-7810-4bd1-982b-bc3da110a2d1)
   )
-  (fp_line (start 69.12 1.3) (end 69.12 4.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 69.12 4.3) (end 61.62 4.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 61.62 4.3) (end 61.62 11.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start 61.62 11.1) (end -6.38 11.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.38 11.1) (end -6.38 4.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.38 4.3) (end -13.88 4.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -13.88 4.3) (end -13.88 1.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -13.88 1.3) (end 69.12 1.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 61.62 11.35) (end -6.63 11.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -6.63 11.35) (end -14.13 11.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.13 11.35) (end -14.13 -1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.13 -1.25) (end 69.37 -1.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 69.37 -1.25) (end 69.37 11.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 69.37 11.35) (end 61.62 11.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 69.12 1.3) (end 69.12 4.3) (layer F.Fab) (width 0.1))
-  (fp_line (start 69.12 4.3) (end 61.62 4.3) (layer F.Fab) (width 0.1))
-  (fp_line (start 61.62 4.3) (end 61.62 11.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 61.62 11.1) (end -6.38 11.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.38 11.1) (end -6.38 4.3) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.38 4.3) (end -13.88 4.3) (layer F.Fab) (width 0.1))
-  (fp_line (start -13.88 4.3) (end -13.88 1.3) (layer F.Fab) (width 0.1))
-  (fp_line (start -13.88 1.3) (end 69.12 1.3) (layer F.Fab) (width 0.1))
-  (fp_text user %R (at 27.62 6.2 180) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 27.62 6.2 180) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2c2c1e88-d6ac-4cc4-8e09-80f372bca783)
   )
-  (pad 4 thru_hole circle (at 7.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 3 thru_hole circle (at 5.08 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 2.54 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 5 thru_hole circle (at 50.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 6 thru_hole circle (at 53.16 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (pad 7 thru_hole circle (at 55.7 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Audio_Module.3dshapes/Reverb_BTDR-1V.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 61.62 11.1) (end -6.38 11.1) (layer "F.SilkS") (width 0.12) (tstamp 2d8f87c0-9dd2-41d3-b1cd-9d71e4644960))
+  (fp_line (start -6.38 4.3) (end -13.88 4.3) (layer "F.SilkS") (width 0.12) (tstamp 690bfa6b-b0f9-4317-ad57-06b3802ac7b0))
+  (fp_line (start -13.88 1.3) (end 69.12 1.3) (layer "F.SilkS") (width 0.12) (tstamp 81a7dfa1-c278-425c-a935-a8b9a29946a6))
+  (fp_line (start -6.38 11.1) (end -6.38 4.3) (layer "F.SilkS") (width 0.12) (tstamp 97cadbec-a55e-41ed-92d5-eb3214b34afd))
+  (fp_line (start -13.88 4.3) (end -13.88 1.3) (layer "F.SilkS") (width 0.12) (tstamp bda1223a-e7ea-4c51-9249-a21d389f3710))
+  (fp_line (start 69.12 1.3) (end 69.12 4.3) (layer "F.SilkS") (width 0.12) (tstamp be83e42e-9ffb-493c-ad07-45c77841473d))
+  (fp_line (start 61.62 4.3) (end 61.62 11.1) (layer "F.SilkS") (width 0.12) (tstamp c5e6a983-b7b3-4b12-9d4a-dd295e782cfe))
+  (fp_line (start 69.12 4.3) (end 61.62 4.3) (layer "F.SilkS") (width 0.12) (tstamp f4ce1fd3-d6c1-4abb-b989-ae90ad642a07))
+  (fp_line (start -14.13 11.35) (end -14.13 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 0662dc2c-544d-47e4-b9a9-078d346b7b8b))
+  (fp_line (start 69.37 -1.25) (end 69.37 11.35) (layer "F.CrtYd") (width 0.05) (tstamp 12d7a82e-b0c6-40b8-a78c-2d112ffab686))
+  (fp_line (start 61.62 11.35) (end -6.63 11.35) (layer "F.CrtYd") (width 0.05) (tstamp 48f58059-e5ec-4db5-97c0-741c62b975e6))
+  (fp_line (start 69.37 11.35) (end 61.62 11.35) (layer "F.CrtYd") (width 0.05) (tstamp 665f55d3-1930-4c50-8ac6-a50812f0ebb7))
+  (fp_line (start -6.63 11.35) (end -14.13 11.35) (layer "F.CrtYd") (width 0.05) (tstamp 6b2036dd-604c-4667-9cd8-889990119aba))
+  (fp_line (start -14.13 -1.25) (end 69.37 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 712967cb-b7b3-4f31-95b5-a3ae7821d1b9))
+  (fp_line (start 61.62 4.3) (end 61.62 11.1) (layer "F.Fab") (width 0.1) (tstamp 1c90e511-a13d-4a19-bb0c-341a540211ff))
+  (fp_line (start -13.88 1.3) (end 69.12 1.3) (layer "F.Fab") (width 0.1) (tstamp 40e6edcf-2dca-4414-8c68-54b5cb516af0))
+  (fp_line (start 69.12 1.3) (end 69.12 4.3) (layer "F.Fab") (width 0.1) (tstamp 422ec1ee-934d-458a-a428-dae9f64f0e7c))
+  (fp_line (start -13.88 4.3) (end -13.88 1.3) (layer "F.Fab") (width 0.1) (tstamp 69e81b15-c24f-4180-a1e2-ddeb5ca6447d))
+  (fp_line (start 61.62 11.1) (end -6.38 11.1) (layer "F.Fab") (width 0.1) (tstamp b8985526-ec53-47c3-9430-ddff43dd0717))
+  (fp_line (start 69.12 4.3) (end 61.62 4.3) (layer "F.Fab") (width 0.1) (tstamp c32cd034-9d5f-4f99-a118-06e174e115a6))
+  (fp_line (start -6.38 11.1) (end -6.38 4.3) (layer "F.Fab") (width 0.1) (tstamp e0811244-7b68-4fcc-9992-3c461271d12c))
+  (fp_line (start -6.38 4.3) (end -13.88 4.3) (layer "F.Fab") (width 0.1) (tstamp f4d1a664-c87b-4415-947e-80bf18cfb575))
+  (pad "1" thru_hole rect (at 0 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 6b54a4cf-1c47-48bd-9076-9d2c1ed1dc0b))
+  (pad "2" thru_hole circle (at 2.54 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 1b5d7c94-aaa1-488b-9352-7b5770314a42))
+  (pad "3" thru_hole circle (at 5.08 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 254b0c32-5f01-4308-b5dd-0a4bc380a715))
+  (pad "4" thru_hole circle (at 7.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp bc6a6a8f-3b8f-413f-88e7-4957bd99351b))
+  (pad "5" thru_hole circle (at 50.62 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 35698302-6de0-4184-aefe-e2cbdd76c272))
+  (pad "6" thru_hole circle (at 53.16 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp c86ea0ec-de68-4d29-839c-dfca7c7d64b3))
+  (pad "7" thru_hole circle (at 55.7 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (tstamp 5fc56d94-ca72-44e4-babd-0986bd43161c))
+  (model "${KICAD6_3DMODEL_DIR}/Audio_Module.3dshapes/Reverb_BTDR-1V.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Bulgin_BX0036_1xC.kicad_mod

@@ -1,36 +1,43 @@
-(module BatteryHolder_Bulgin_BX0036_1xC (layer F.Cu) (tedit 5C0C1564)
+(footprint "BatteryHolder_Bulgin_BX0036_1xC" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5C0C1564)
   (descr "Bulgin Battery Holder, BX0036, Battery Type C (https://www.bulgin.com/products/pub/media/bulgin/data/Battery_holders.pdf)")
   (tags "Bulgin BX0036")
-  (fp_text reference REF** (at 27.8 -18.1) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 27.8 -18.1) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 520b96fb-61ef-4ae7-ba95-0bade8f6e6dd)
   )
-  (fp_text value BatteryHolder_Bulgin_BX0036_1xC (at 27.8 1) (layer F.Fab)
+  (fp_text value "BatteryHolder_Bulgin_BX0036_1xC" (at 27.8 1) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 8ccf3c79-fdd6-474e-9064-591c2b86ece7)
   )
-  (fp_line (start -1.75 17) (end -1.75 -17) (layer F.Fab) (width 0.1))
-  (fp_line (start 57.35 17) (end -1.75 17) (layer F.Fab) (width 0.1))
-  (fp_line (start 57.35 -17) (end 57.35 17) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.75 -17) (end 57.35 -17) (layer F.Fab) (width 0.1))
-  (fp_text user + (at 3 -0.2) (layer F.SilkS)
+  (fp_text user "+" (at 3 -0.2) (layer "F.SilkS")
     (effects (font (size 3 3) (thickness 0.45)))
+    (tstamp 3017ff5a-a688-458b-bc91-2b91ea1e010c)
   )
-  (fp_line (start -2.3 -17.5) (end 57.9 -17.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 57.9 -17.5) (end 57.9 17.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 57.9 17.5) (end -2.3 17.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.3 17.5) (end -2.3 -17.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.81 -17.06) (end -1.81 17.06) (layer F.SilkS) (width 0.12))
-  (fp_line (start 57.41 -17.06) (end 57.41 17.06) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.81 -17.06) (end 57.41 -17.06) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.81 17.06) (end 57.41 17.06) (layer F.SilkS) (width 0.12))
-  (fp_text user %R (at 27.8 -1) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 27.8 -1) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.1)))
+    (tstamp a35b849b-99f9-44ef-a71c-43032176d7da)
   )
-  (pad 2 thru_hole circle (at 55.6 0) (size 2.6 2.6) (drill 1.6) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 2.6 2.6) (drill 1.6) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 11.9 0) (size 3.8 3.8) (drill 3.8) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 43.7 0) (size 3.8 3.8) (drill 3.8) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -1.81 -17.06) (end 57.41 -17.06) (layer "F.SilkS") (width 0.12) (tstamp 2d345aa1-b8a7-433b-98bf-3fb90d3260bf))
+  (fp_line (start -1.81 -17.06) (end -1.81 17.06) (layer "F.SilkS") (width 0.12) (tstamp 56dcfdd4-a743-4142-9693-f6294ad7e428))
+  (fp_line (start 57.41 -17.06) (end 57.41 17.06) (layer "F.SilkS") (width 0.12) (tstamp ab2492fb-5ac3-4b2a-b037-e9cee37167b9))
+  (fp_line (start -1.81 17.06) (end 57.41 17.06) (layer "F.SilkS") (width 0.12) (tstamp cb7c1e3e-a32d-43a8-bf93-cbb15668bf6c))
+  (fp_line (start 57.9 17.5) (end -2.3 17.5) (layer "F.CrtYd") (width 0.05) (tstamp 2d06b9ca-8acd-4dde-82af-2f04bb0f605f))
+  (fp_line (start 57.9 -17.5) (end 57.9 17.5) (layer "F.CrtYd") (width 0.05) (tstamp 710deca7-5df4-4e58-8361-22c21253049c))
+  (fp_line (start -2.3 -17.5) (end 57.9 -17.5) (layer "F.CrtYd") (width 0.05) (tstamp a4e64c80-b2df-4558-a2cb-a8c6591229fc))
+  (fp_line (start -2.3 17.5) (end -2.3 -17.5) (layer "F.CrtYd") (width 0.05) (tstamp bbb741ba-316d-46de-b5ab-b0a0f937c88b))
+  (fp_line (start 57.35 17) (end -1.75 17) (layer "F.Fab") (width 0.1) (tstamp 5073e2aa-8704-462c-b9ec-5d0a20454258))
+  (fp_line (start -1.75 17) (end -1.75 -17) (layer "F.Fab") (width 0.1) (tstamp 54b9aef8-b50a-46a4-bd39-fa76fe97d610))
+  (fp_line (start 57.35 -17) (end 57.35 17) (layer "F.Fab") (width 0.1) (tstamp c40555a2-76f6-47f6-8565-ddb5b88a8a7f))
+  (fp_line (start -1.75 -17) (end 57.35 -17) (layer "F.Fab") (width 0.1) (tstamp d505ba7e-ac8c-43a9-96ab-75c05d042f88))
+  (pad "" np_thru_hole circle (at 43.7 0) (size 3.8 3.8) (drill 3.8) (layers *.Cu *.Mask) (tstamp 26fa0e55-ded5-4fdc-9c3a-463e0e15d145))
+  (pad "" np_thru_hole circle (at 11.9 0) (size 3.8 3.8) (drill 3.8) (layers *.Cu *.Mask) (tstamp d204374d-427d-4184-8cac-34c3c45ae776))
+  (pad "1" thru_hole rect (at 0 0) (size 2.6 2.6) (drill 1.6) (layers *.Cu *.Mask) (tstamp 06b0de7a-8452-47e4-8156-099c9b3d0d4a))
+  (pad "2" thru_hole circle (at 55.6 0) (size 2.6 2.6) (drill 1.6) (layers *.Cu *.Mask) (tstamp 7076fdf9-3d9e-46dc-8021-cde9c82fa64e))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_ComfortableElectronic_CH273-2450_1x2450.kicad_mod

@@ -1,31 +1,37 @@
-(module "BatteryHolder_ComfortableElectronic_CH273-2450_1x2450" (layer F.Cu) (tedit 5CBC45F7)
+(footprint "BatteryHolder_ComfortableElectronic_CH273-2450_1x2450" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5CBC45F7)
   (descr "Comfortable Electronic CR2450 battery holder, http://www.comf.com.tw/ProductDetail.asp?no=148")
   (tags "Comfortable Electronic CR2450")
-  (fp_text reference "REF**" (at 0.1 -6.62) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0.1 -6.62) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 9748ed67-5a48-4404-bfda-17e3607893e1)
   )
-  (fp_text value "BatteryHolder_ComfortableElectronic_CH273-2450_1x2450" (at 13.47 2.54) (layer F.Fab)
+  (fp_text value "BatteryHolder_ComfortableElectronic_CH273-2450_1x2450" (at 13.47 2.54) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e0e60bdd-0511-4b83-92d3-d76d0eef54f9)
   )
-  (fp_text user "%R" (at 14 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 14 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.1)))
+    (tstamp 04cd1d0c-9221-4695-ba1d-35fc9860db31)
   )
-  (fp_arc (start 14.28 0) (end 1.95 -5.5) (angle 311.9199008) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.22 -5.5) (end 1.95 -5.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.22 5.5) (end -1.22 -5.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.95 5.5) (end -1.22 5.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.47 -5.75) (end 1.77 -5.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.47 5.75) (end -1.47 -5.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.77 5.75) (end -1.47 5.75) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 14.28 0) (end 1.845 -5.61) (angle 311.4353527) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.33 -5.61) (end 1.845 -5.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.33 5.61) (end -1.33 -5.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.845 5.61) (end -1.33 5.61) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 14.28 0) (end 1.77 -5.75) (angle 310.6299215) (layer F.CrtYd) (width 0.05))
-  (pad "1" thru_hole rect (at 0 0 270) (size 2.1 2.1) (drill 1.3) (layers *.Cu *.Mask))
-  (pad "2" thru_hole circle (at 20 0 270) (size 2.1 2.1) (drill 1.3) (layers *.Cu *.Mask))
+  (fp_line (start 1.845 5.61) (end -1.33 5.61) (layer "F.SilkS") (width 0.12) (tstamp 81f959f7-1f97-4566-804a-34a5e1a17163))
+  (fp_line (start -1.33 5.61) (end -1.33 -5.61) (layer "F.SilkS") (width 0.12) (tstamp 8385a8ef-c520-4094-a28f-fe163a2b94bf))
+  (fp_line (start -1.33 -5.61) (end 1.845 -5.61) (layer "F.SilkS") (width 0.12) (tstamp c3334750-9a9f-4566-93f3-8767f500c5cc))
+  (fp_arc (start 1.845 -5.61) (mid 27.921896 0) (end 1.845 5.61) (layer "F.SilkS") (width 0.12) (tstamp 5dc78aa8-63a6-491f-8d62-1e7c23d1ec6e))
+  (fp_line (start -1.47 5.75) (end -1.47 -5.75) (layer "F.CrtYd") (width 0.05) (tstamp 2b100c91-cfa1-421f-b3a9-1da2be61d4ac))
+  (fp_line (start 1.77 5.75) (end -1.47 5.75) (layer "F.CrtYd") (width 0.05) (tstamp 77f3bda6-6e94-408f-8b1a-4106f486424b))
+  (fp_line (start -1.47 -5.75) (end 1.77 -5.75) (layer "F.CrtYd") (width 0.05) (tstamp 97fd15f6-4957-4434-a58e-cd3db55107fb))
+  (fp_arc (start 1.77 -5.75) (mid 28.048173 0) (end 1.77 5.75) (layer "F.CrtYd") (width 0.05) (tstamp 68f3b4ee-5c26-406b-9d97-eb20a8b6fd0f))
+  (fp_line (start -1.22 -5.5) (end 1.95 -5.5) (layer "F.Fab") (width 0.1) (tstamp 01989a2f-a09e-4d85-b6b9-329b04ae2c0e))
+  (fp_line (start -1.22 5.5) (end -1.22 -5.5) (layer "F.Fab") (width 0.1) (tstamp 69a25a72-a75d-432e-9821-f1a057fce927))
+  (fp_line (start 1.95 5.5) (end -1.22 5.5) (layer "F.Fab") (width 0.1) (tstamp dcb2e48c-cca2-4c85-95e1-d2e9c7dbc489))
+  (fp_arc (start 1.95 -5.5) (mid 27.78107 0) (end 1.95 5.5) (layer "F.Fab") (width 0.1) (tstamp 96ad3553-03f8-4050-9424-3c1437f96b15))
+  (pad "1" thru_hole rect (at 0 0 270) (size 2.1 2.1) (drill 1.3) (layers *.Cu *.Mask) (tstamp d40cb5c3-bc4e-430d-99b4-b09ca1f1b4ce))
+  (pad "2" thru_hole circle (at 20 0 270) (size 2.1 2.1) (drill 1.3) (layers *.Cu *.Mask) (tstamp 9d74bc35-6877-4088-81d0-31d595876451))
   (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_ComfortableElectronic_CH273-2450_1x2450.wrl"
-    (at (xyz 0 0 0))
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Eagle_12BH611-GR.kicad_mod

@@ -1,62 +1,70 @@
-(module BatteryHolder_Eagle_12BH611-GR (layer F.Cu) (tedit 5F4B6D66)
-  (descr https://eu.mouser.com/datasheet/2/209/EPD-200766-1274481.pdf)
+(footprint "BatteryHolder_Eagle_12BH611-GR" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5F4B6D66)
+  (descr "https://eu.mouser.com/datasheet/2/209/EPD-200766-1274481.pdf")
   (tags "9V Battery Holder")
-  (fp_text reference REF** (at -24.13 -24.13) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -24.13 -24.13) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 7fd7b074-7192-41aa-818e-b662c90e9bd6)
   )
-  (fp_text value BatteryHolder_Eagle_12BH611-GR (at -24.13 11.43 180) (layer F.Fab)
+  (fp_text value "BatteryHolder_Eagle_12BH611-GR" (at -24.13 11.43 180) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp a88d370a-1f67-4bad-b969-4e77420809f8)
   )
-  (fp_line (start -51.4 -21.45) (end 3.1 -21.45) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.1 -21.45) (end 3.1 8.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.1 8.75) (end -51.4 8.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start -51.4 8.75) (end -51.4 -21.45) (layer F.SilkS) (width 0.12))
-  (fp_text user + (at -7 0) (layer F.Fab)
+  (fp_text user "-" (at -7 -12.7) (layer "F.Fab")
     (effects (font (size 3 3) (thickness 0.45)))
+    (tstamp 0347a3b1-050b-4986-ab39-9589dd2ae31e)
   )
-  (fp_text user - (at -7 -12.7) (layer F.Fab)
+  (fp_text user "+" (at -7 0) (layer "F.Fab")
     (effects (font (size 3 3) (thickness 0.45)))
+    (tstamp 4210ec31-db6c-4cf4-9ace-a7364bf7d690)
   )
-  (fp_line (start -51.9 -21.95) (end 3.6 -21.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.6 -21.95) (end 3.6 9.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.6 9.25) (end -51.9 9.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -51.9 9.25) (end -51.9 -21.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.85 8.75) (end 1.85 -21.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 -21.45) (end -2 8.75) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 -14.75) (end -4 -14.75) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -14.75) (end -4 -10.65) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -10.65) (end -2 -10.65) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 -0.25) (end -4 -0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -2.55) (end -4 2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 0.25) (end -2 0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -2.05) (end -2 -2.05) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 -2.55) (end -4 -2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 2.55) (end -2 2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 2.05) (end -4 2.05) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 -19.35) (end -27 -19.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -27 -19.35) (end -27 -21.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -2 6.65) (end -27 6.65) (layer F.Fab) (width 0.1))
-  (fp_line (start -27 6.65) (end -27 8.75) (layer F.Fab) (width 0.1))
-  (fp_line (start -51.4 -15.35) (end -47 -15.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -51.4 2.65) (end -47 2.65) (layer F.Fab) (width 0.1))
-  (fp_line (start -50 2.65) (end -50 -15.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -49 2.65) (end -49 -15.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -48 2.65) (end -48 -15.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -47 2.65) (end -47 -15.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -51.4 8.75) (end -51.4 -21.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -51.4 -21.45) (end 3.1 -21.45) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.1 8.75) (end -51.4 8.75) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.1 -21.45) (end 3.1 8.75) (layer F.Fab) (width 0.1))
-  (fp_text user %R (at -24.13 -6.35 180) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at -24.13 -6.35 180) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 4ccd0e2d-0f2d-48df-b3f6-5c31626bdd6a)
   )
-  (pad 2 thru_hole circle (at 0 -12.7) (size 3 3) (drill 2.4) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 2.4) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -10.9 -17.45) (size 2.6 2.6) (drill 2.6) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -38.9 -17.45) (size 2.6 2.6) (drill 2.6) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -24.15 4.75) (size 2.6 2.6) (drill 2.6) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Eagle_12BH611-GR.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 3.1 -21.45) (end 3.1 8.75) (layer "F.SilkS") (width 0.12) (tstamp 8a0657e1-aba8-439e-8aa6-2363a5256aec))
+  (fp_line (start 3.1 8.75) (end -51.4 8.75) (layer "F.SilkS") (width 0.12) (tstamp b24f0e73-d48f-4379-a97f-ad11b2710cb9))
+  (fp_line (start -51.4 -21.45) (end 3.1 -21.45) (layer "F.SilkS") (width 0.12) (tstamp c1cba08b-6180-419f-a149-74473778e63f))
+  (fp_line (start -51.4 8.75) (end -51.4 -21.45) (layer "F.SilkS") (width 0.12) (tstamp ed32083c-03ce-447b-83e6-52ebab7a3d6e))
+  (fp_line (start -51.9 9.25) (end -51.9 -21.95) (layer "F.CrtYd") (width 0.05) (tstamp 09f15a8f-7e54-457b-a3f4-8d8e54810da0))
+  (fp_line (start -51.9 -21.95) (end 3.6 -21.95) (layer "F.CrtYd") (width 0.05) (tstamp 130ae03e-b540-4b2e-bd23-98949a0f6724))
+  (fp_line (start 3.6 9.25) (end -51.9 9.25) (layer "F.CrtYd") (width 0.05) (tstamp 14381b89-d277-473b-94f7-017ada018860))
+  (fp_line (start 3.6 -21.95) (end 3.6 9.25) (layer "F.CrtYd") (width 0.05) (tstamp eb8899a2-629f-4b54-88b9-74b585f58940))
+  (fp_line (start -2 2.05) (end -4 2.05) (layer "F.Fab") (width 0.1) (tstamp 1704d449-1c00-4786-bf86-4a0d225e7b58))
+  (fp_line (start -50 2.65) (end -50 -15.35) (layer "F.Fab") (width 0.1) (tstamp 1dd0b5d8-b3b0-4e85-a46d-fc809eeb2c8e))
+  (fp_line (start -48 2.65) (end -48 -15.35) (layer "F.Fab") (width 0.1) (tstamp 1eed954a-f373-42a1-a35e-683231ff10e1))
+  (fp_line (start -4 -2.05) (end -2 -2.05) (layer "F.Fab") (width 0.1) (tstamp 3292b181-2e30-4c46-ae21-c6000749ddb4))
+  (fp_line (start -51.4 2.65) (end -47 2.65) (layer "F.Fab") (width 0.1) (tstamp 33a0f04c-0aa8-40f3-9fab-cf27bfa03560))
+  (fp_line (start -2 -0.25) (end -4 -0.25) (layer "F.Fab") (width 0.1) (tstamp 4223e635-e89d-42c4-8684-c0f1e65676f9))
+  (fp_line (start -2 -19.35) (end -27 -19.35) (layer "F.Fab") (width 0.1) (tstamp 4c74572d-f62c-4621-b1de-caa4f8a7aba5))
+  (fp_line (start 3.1 8.75) (end -51.4 8.75) (layer "F.Fab") (width 0.1) (tstamp 66562051-7e98-44cf-bba6-a06fbbf25d7a))
+  (fp_line (start 3.1 -21.45) (end 3.1 8.75) (layer "F.Fab") (width 0.1) (tstamp 6b60671e-0db3-4a0e-8844-fddb67f50780))
+  (fp_line (start -27 6.65) (end -27 8.75) (layer "F.Fab") (width 0.1) (tstamp 7ab69c4e-4b9c-4df0-9029-34edef09d06f))
+  (fp_line (start -4 -2.55) (end -4 2.55) (layer "F.Fab") (width 0.1) (tstamp 91e8954d-b1f1-4a3b-b640-47f739413266))
+  (fp_line (start -51.4 -15.35) (end -47 -15.35) (layer "F.Fab") (width 0.1) (tstamp 9c9c74fd-9325-444a-be9c-f38bdbc45ace))
+  (fp_line (start -27 -19.35) (end -27 -21.45) (layer "F.Fab") (width 0.1) (tstamp b3f21e56-b12b-4e7b-a3c0-08f290718e8c))
+  (fp_line (start -4 -10.65) (end -2 -10.65) (layer "F.Fab") (width 0.1) (tstamp bf636172-3281-4a45-9ba3-ffcc5b3d65ec))
+  (fp_line (start 1.85 8.75) (end 1.85 -21.45) (layer "F.Fab") (width 0.1) (tstamp d7124cff-5e73-487c-a5df-fb3f461ddc1f))
+  (fp_line (start -4 -14.75) (end -4 -10.65) (layer "F.Fab") (width 0.1) (tstamp db9fbf35-916d-491a-8edc-42dfc99cbab7))
+  (fp_line (start -4 2.55) (end -2 2.55) (layer "F.Fab") (width 0.1) (tstamp dbec3ab1-0a0b-4b1b-9969-4fca0aa6de27))
+  (fp_line (start -2 -2.55) (end -4 -2.55) (layer "F.Fab") (width 0.1) (tstamp e322ad30-be6d-4bed-a2ee-1dcd1f09bf18))
+  (fp_line (start -51.4 -21.45) (end 3.1 -21.45) (layer "F.Fab") (width 0.1) (tstamp e46af269-4ee7-413e-8566-758b4568013a))
+  (fp_line (start -4 0.25) (end -2 0.25) (layer "F.Fab") (width 0.1) (tstamp e5e420e1-8f35-4b51-ae3a-6f97a54d8c81))
+  (fp_line (start -51.4 8.75) (end -51.4 -21.45) (layer "F.Fab") (width 0.1) (tstamp e88fe421-2395-43d0-a318-e90321b5add9))
+  (fp_line (start -2 -14.75) (end -4 -14.75) (layer "F.Fab") (width 0.1) (tstamp ecb92bd0-45b2-4a61-b989-cf969ee9b7f1))
+  (fp_line (start -2 -21.45) (end -2 8.75) (layer "F.Fab") (width 0.1) (tstamp f0160d0a-1373-4219-993e-ef5effccd1d5))
+  (fp_line (start -47 2.65) (end -47 -15.35) (layer "F.Fab") (width 0.1) (tstamp f13e8143-8fc2-4177-a512-334da678da14))
+  (fp_line (start -49 2.65) (end -49 -15.35) (layer "F.Fab") (width 0.1) (tstamp f5debf48-00a3-4633-abc8-e189921a925d))
+  (fp_line (start -2 6.65) (end -27 6.65) (layer "F.Fab") (width 0.1) (tstamp f9ee9284-a3ab-4cfc-8d4b-15032be27a0b))
+  (pad "" np_thru_hole circle (at -38.9 -17.45) (size 2.6 2.6) (drill 2.6) (layers *.Cu *.Mask) (tstamp 20799aec-0196-4d10-877f-81667cefbc74))
+  (pad "" np_thru_hole circle (at -24.15 4.75) (size 2.6 2.6) (drill 2.6) (layers *.Cu *.Mask) (tstamp 541193f7-b4d4-4b21-a245-d405144fa241))
+  (pad "" np_thru_hole circle (at -10.9 -17.45) (size 2.6 2.6) (drill 2.6) (layers *.Cu *.Mask) (tstamp 6868975f-763a-4019-a8da-11a66b70620d))
+  (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 2.4) (layers *.Cu *.Mask) (tstamp 224e0654-386f-4cfd-a99c-b38ad221ea64))
+  (pad "2" thru_hole circle (at 0 -12.7) (size 3 3) (drill 2.4) (layers *.Cu *.Mask) (tstamp 4befa7d1-7995-4bc6-878d-d6544c8f6c8a))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Eagle_12BH611-GR.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_103_1x20mm.kicad_mod

@@ -1,57 +1,64 @@
-(module BatteryHolder_Keystone_103_1x20mm (layer F.Cu) (tedit 5787C32C)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=719)
+(footprint "BatteryHolder_Keystone_103_1x20mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5787C32C)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=719")
   (tags "Keystone type 103 battery holder")
-  (fp_text reference REF** (at 0 -4.3) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -4.3) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp dcae7e4d-1f08-47eb-91d2-1da96e82ca96)
   )
-  (fp_text value BatteryHolder_Keystone_103_1x20mm (at 15 13) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_103_1x20mm" (at 15 13) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 7f2dca49-e855-496a-88b0-bfa2a25730ca)
   )
-  (fp_text user + (at 2.75 0) (layer F.SilkS)
+  (fp_text user "+" (at 2.75 0) (layer "F.SilkS")
     (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp fdf7ade8-5716-4835-9a77-d817be39cf8f)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp a4787465-0baf-4ae3-af84-1dae56427259)
   )
-  (fp_arc (start 15.2 0) (end 4.01 3.6) (angle -162.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 4.01 -3.6) (angle 162.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 3.5 3.8) (end 3.5 3.25) (angle 70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 3.5 -3.8) (end 3.5 -3.25) (angle -70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 4.25 3.5) (angle -162.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 3.5 3.8) (end 3.5 3) (angle 70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 4.25 -3.5) (angle 162.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 3.5 -3.8) (end 3.5 -3) (angle -70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 3.5 3.8) (end 3.5 2.9) (angle 70) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 4.35 3.5) (angle -162.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 4.35 -3.5) (angle 162.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 5.2 1.3) (angle -180) (layer F.Fab) (width 0.10))
-  (fp_line (start -2.45 -3.25) (end 3.5 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.45 3.25) (end 3.5 3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.45 3.25) (end -2.45 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.2 -3) (end 3.5 -3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.2 3) (end -2.2 -3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.2 3) (end 3.5 3) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 9 1.3) (angle -170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 1.3) (angle -150) (layer F.Fab) (width 0.10))
-  (fp_line (start 23.5712 7.7216) (end 22.6568 6.8834) (layer F.Fab) (width 0.10))
-  (fp_line (start 23.5712 -7.7216) (end 22.6314 -6.858) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 -1.3) (angle 150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 -1.3) (angle 170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 5.2 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 3.5306 -2.9) (end -1.7 -2.9) (layer F.Fab) (width 0.10))
-  (fp_line (start -1.7 2.9) (end 3.5306 2.9) (layer F.Fab) (width 0.10))
-  (fp_line (start -2.1 -2.5) (end -2.1 2.5) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 1.3) (end 16.2 1.3) (layer F.Fab) (width 0.10))
-  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start 3.5 -3.8) (end 3.5 -2.9) (angle -70) (layer F.Fab) (width 0.10))
-  (fp_arc (start 16.2 0) (end 16.2 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 -1.3) (end 0 1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.7 2.5) (end -2.1 2.5) (angle -90) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.7 -2.5) (end -2.1 -2.5) (angle 90) (layer F.Fab) (width 0.10))
-  (pad 2 thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_103_1x20mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -2.2 3) (end 3.5 3) (layer "F.SilkS") (width 0.12) (tstamp 35a82bb0-3b0a-4f9a-aca4-4f1ce9fcce0a))
+  (fp_line (start -2.2 3) (end -2.2 -3) (layer "F.SilkS") (width 0.12) (tstamp 6c718244-72ce-4001-8901-454579ec0651))
+  (fp_line (start -2.2 -3) (end 3.5 -3) (layer "F.SilkS") (width 0.12) (tstamp d7c1c354-6ead-451a-a197-e8cf01340c92))
+  (fp_arc (start 4.25 -3.5) (mid 16.993514 -11.35499) (end 26.695671 0.045281) (layer "F.SilkS") (width 0.12) (tstamp 835eac46-026b-4b49-9b53-faf3e0f8a813))
+  (fp_arc (start 26.695671 -0.045281) (mid 16.993514 11.35499) (end 4.25 3.5) (layer "F.SilkS") (width 0.12) (tstamp 85e7c131-2783-45e0-b3ca-9bec08c0f3bb))
+  (fp_arc (start 4.251754 -3.526384) (mid 3.958861 -3.144678) (end 3.5 -3) (layer "F.SilkS") (width 0.12) (tstamp 9de3b43f-102a-41cc-b525-4e73160a0e8f))
+  (fp_arc (start 3.5 3) (mid 3.958861 3.144678) (end 4.251754 3.526384) (layer "F.SilkS") (width 0.12) (tstamp e73b1c8f-367c-4fe4-a7a5-6e20c35deaa4))
+  (fp_line (start -2.45 -3.25) (end 3.5 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp 3b308224-509a-46cf-8b98-017c366200d0))
+  (fp_line (start -2.45 3.25) (end -2.45 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp 4ce6c269-643b-4857-bc6d-3d87a2d436b6))
+  (fp_line (start -2.45 3.25) (end 3.5 3.25) (layer "F.CrtYd") (width 0.05) (tstamp 7928995a-e053-481b-86df-69ac3b06b1ea))
+  (fp_arc (start 4.01 -3.6) (mid 17.055841 -11.60741) (end 26.954634 0.068483) (layer "F.CrtYd") (width 0.05) (tstamp 07bff8ad-f2a9-4981-a768-720ec4cc304a))
+  (fp_arc (start 3.5 3.25) (mid 3.815467 3.349466) (end 4.016831 3.611889) (layer "F.CrtYd") (width 0.05) (tstamp 3f5740a4-0bd0-4836-a506-d34982b2df65))
+  (fp_arc (start 4.016831 -3.611889) (mid 3.815467 -3.349466) (end 3.5 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp 5d4571ca-652e-47f8-b914-2a8715c35370))
+  (fp_arc (start 26.954634 -0.068483) (mid 17.055841 11.60741) (end 4.01 3.6) (layer "F.CrtYd") (width 0.05) (tstamp afb52eb5-25df-4ca7-8fa9-c0916b5ad146))
+  (fp_line (start -1.7 2.9) (end 3.5306 2.9) (layer "F.Fab") (width 0.1) (tstamp 01a47cfb-5db8-4116-ab0c-9dac3ca2884b))
+  (fp_line (start 0 1.3) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 693f59fb-afd8-4e17-aba3-f14420dca7f6))
+  (fp_line (start 0 -1.3) (end 0 1.3) (layer "F.Fab") (width 0.1) (tstamp 6b2cc79f-faef-4aba-a2b7-2e9fa6d1c7e1))
+  (fp_line (start 3.5306 -2.9) (end -1.7 -2.9) (layer "F.Fab") (width 0.1) (tstamp a08a5cb0-3051-4243-99b6-385fdb88805c))
+  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer "F.Fab") (width 0.1) (tstamp a93bc8d7-517a-4f74-9d5e-ea095e5aa42f))
+  (fp_line (start 23.5712 7.7216) (end 22.6568 6.8834) (layer "F.Fab") (width 0.1) (tstamp e9bfc1c3-2f04-4f9c-85b6-012241becff6))
+  (fp_line (start -2.1 -2.5) (end -2.1 2.5) (layer "F.Fab") (width 0.1) (tstamp ee35df44-c7ef-4194-a2e4-92294b87e565))
+  (fp_line (start 23.5712 -7.7216) (end 22.6314 -6.858) (layer "F.Fab") (width 0.1) (tstamp f94abcbe-04ed-4b75-af7f-379b2587feeb))
+  (fp_arc (start 4.35 -3.5) (mid 17.008726 -11.256154) (end 26.600299 0.075351) (layer "F.Fab") (width 0.1) (tstamp 0ed88d43-e35d-4d47-89f2-2263956cc6cd))
+  (fp_arc (start 25.2 -1.3) (mid 16.5 10) (end 5.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 28362a34-32a4-4d17-82c0-2bc6f2756cbb))
+  (fp_arc (start 5.2 -1.3) (mid 16.5 -10) (end 25.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 3334f023-a7e7-4d17-86ed-8b9dde61ca8d))
+  (fp_arc (start 26.600299 -0.075351) (mid 17.008726 11.256154) (end 4.35 3.5) (layer "F.Fab") (width 0.1) (tstamp 4c6bc272-025d-4b21-8c37-99d3b1b8af75))
+  (fp_arc (start 9 -1.3) (mid 15.954687 -6.28971) (end 21.531551 0.203631) (layer "F.Fab") (width 0.1) (tstamp 67e286ca-ea5b-43fe-99a6-9f89d4e9ac87))
+  (fp_arc (start -2.1 -2.5) (mid -1.982843 -2.782843) (end -1.7 -2.9) (layer "F.Fab") (width 0.1) (tstamp 76137f65-ae55-4479-88a2-b61bc472b668))
+  (fp_arc (start 21.531551 -0.203631) (mid 15.954687 6.28971) (end 9 1.3) (layer "F.Fab") (width 0.1) (tstamp 79ccda69-df48-4706-9e24-970670b8e7ad))
+  (fp_arc (start 17.495448 -0.175833) (mid 15.963947 2.171724) (end 13.3 1.3) (layer "F.Fab") (width 0.1) (tstamp 80d81cf0-9266-4629-9c73-efb5a223e9eb))
+  (fp_arc (start 16.2 -1.3) (mid 17.5 0) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp bb7dc9b9-ab23-4f01-942d-1426a5647355))
+  (fp_arc (start 3.5 2.9) (mid 4.016219 3.062763) (end 4.345723 3.492182) (layer "F.Fab") (width 0.1) (tstamp beaa6c25-4846-495b-8b08-ccccb90a2664))
+  (fp_arc (start -1.7 2.9) (mid -1.982843 2.782843) (end -2.1 2.5) (layer "F.Fab") (width 0.1) (tstamp cafecb0e-0c24-41ab-ba1f-2fffa6cd311c))
+  (fp_arc (start 4.345723 -3.492182) (mid 4.016219 -3.062763) (end 3.5 -2.9) (layer "F.Fab") (width 0.1) (tstamp e37b038c-4abf-47f6-932c-66cc15cb272e))
+  (fp_arc (start 13.3 -1.3) (mid 15.963947 -2.171724) (end 17.495448 0.175833) (layer "F.Fab") (width 0.1) (tstamp ffb06a4f-90c8-40f4-a75d-34a0160a449a))
+  (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp 0b728477-2ed9-48b9-9a8b-ec3c3dd63cdc))
+  (pad "2" thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp b0679708-99bd-4a4c-86b2-fde6f5d2cd3a))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_103_1x20mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_1042_1x18650.kicad_mod

@@ -1,50 +1,55 @@
-(module BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499)
+(footprint "BatteryHolder_Keystone_1042_1x18650" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5A033499)
   (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
   (tags "18650 Keystone 1042 Li-ion")
   (attr smd)
-  (fp_text reference REF** (at 0 -11.5) (layer F.SilkS)
+  (fp_text reference "REF**" (at 0 -11.5) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 3483d0e7-1bf8-4e29-be1d-a33981fec054)
   )
-  (fp_text value BatteryHolder_Keystone_1042_1x18650 (at 0 11.3) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_1042_1x18650" (at 0 11.3) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e92b8f7e-4eb2-4f0e-94f5-ce50820fbcdd)
   )
-  (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-  (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-  (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp bfeeeccd-b721-4b69-bbe1-096de4308904)
   )
-  (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-  (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-  (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-  (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-  (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-  (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-  (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-  (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-  (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-  (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-  (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-  (pad 1 smd rect (at -39.33 0) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 39.33 0) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask))
-  (pad "" np_thru_hole circle (at 27.6 -8) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -27.6 8) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -35.93 -8) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer "F.SilkS") (width 0.12) (tstamp 119284d6-cd29-45b2-90dd-dfae58b1f7fd))
+  (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer "F.SilkS") (width 0.12) (tstamp 4b816e52-c8a9-4973-8e3f-a3273c8c9698))
+  (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer "F.SilkS") (width 0.12) (tstamp 65ff2da8-191e-4786-a68b-78e19f1a4015))
+  (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer "F.SilkS") (width 0.12) (tstamp 69243cf7-41eb-482d-9316-7a8136b16847))
+  (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer "F.SilkS") (width 0.12) (tstamp 6f06de67-07f6-4241-921c-204143eefd62))
+  (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer "F.SilkS") (width 0.12) (tstamp 9b170cb7-e6b2-4e9b-a00a-08b37d60a99f))
+  (fp_line (start 43.75 -6) (end 41.25 -6) (layer "F.SilkS") (width 0.12) (tstamp c0de76c8-ce4a-4450-b585-8752273b7b04))
+  (fp_line (start -43.75 -6) (end -41.25 -6) (layer "F.SilkS") (width 0.12) (tstamp c21e3855-64ca-4eac-bc38-3be0457c894c))
+  (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer "F.SilkS") (width 0.12) (tstamp c6e85611-a9b3-451e-936b-38f2e7f7b5ce))
+  (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer "F.SilkS") (width 0.12) (tstamp cde46c95-4fe0-471a-9835-6729036a9929))
+  (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer "F.CrtYd") (width 0.05) (tstamp 10c9c5fc-c7e4-46b8-b294-f16bf6bd5c43))
+  (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer "F.CrtYd") (width 0.05) (tstamp 1b196b18-ef11-435e-b844-1e035d09097b))
+  (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer "F.CrtYd") (width 0.05) (tstamp 2712ed92-1381-4975-9847-940ff336be51))
+  (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer "F.CrtYd") (width 0.05) (tstamp 403159c0-2b22-4484-967a-24b314d4713a))
+  (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer "F.CrtYd") (width 0.05) (tstamp 4b0b3358-070e-40ac-b5fe-9782a4655842))
+  (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer "F.CrtYd") (width 0.05) (tstamp 68bd79c7-e823-4fc0-8570-51ebd5a00fca))
+  (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer "F.CrtYd") (width 0.05) (tstamp 6a802f70-c582-47e6-95f7-274e10374490))
+  (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer "F.CrtYd") (width 0.05) (tstamp 92c21e69-09e0-4326-9e86-b5ceaccb7a34))
+  (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer "F.CrtYd") (width 0.05) (tstamp af6e9ed5-a47f-42a8-b5e4-b86a9d946fb0))
+  (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer "F.CrtYd") (width 0.05) (tstamp b3d390cd-e687-4d40-9379-3a95608deaa1))
+  (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer "F.CrtYd") (width 0.05) (tstamp d0a2a9b3-5d8c-4899-9a1e-fa753f176591))
+  (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer "F.CrtYd") (width 0.05) (tstamp d15df256-11fb-4168-8a1d-1fcdf4d8e9c9))
+  (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer "F.Fab") (width 0.1) (tstamp 547f68db-282e-42fd-a6eb-9f2ba833ca0f))
+  (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer "F.Fab") (width 0.1) (tstamp 69e703d5-16af-492f-a1c8-db4df075b4f8))
+  (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer "F.Fab") (width 0.1) (tstamp 83902181-60f3-4167-a550-00221cc5baab))
+  (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer "F.Fab") (width 0.1) (tstamp 9c82e053-b02b-4d49-a31a-74a2dcfb743d))
+  (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer "F.Fab") (width 0.1) (tstamp bf631a5d-cb29-41cf-aa63-5d93c7ec6474))
+  (pad "" np_thru_hole circle (at -27.6 8) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask) (tstamp 9d4bbab6-0c62-4ecb-b7c2-fc81191bcc6f))
+  (pad "" np_thru_hole circle (at -35.93 -8) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask) (tstamp efdce101-8b9f-45ee-b4b9-2bb7932e1ddb))
+  (pad "" np_thru_hole circle (at 27.6 -8) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask) (tstamp f5aa9af3-88fc-4711-a221-80eee401e79b))
+  (pad "1" smd rect (at -39.33 0) (size 7.34 6.35) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c63d5d6c-97ee-4909-886e-5f964cedd186))
+  (pad "2" smd rect (at 39.33 0) (size 7.34 6.35) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 71e6f9f2-b2e3-42e9-9c31-30528b6be677))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_104_1x23mm.kicad_mod

@@ -1,58 +1,65 @@
-(module BatteryHolder_Keystone_104_1x23mm (layer F.Cu) (tedit 5787C34F)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=744)
+(footprint "BatteryHolder_Keystone_104_1x23mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5787C34F)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=744")
   (tags "Keystone type 104 battery holder")
-  (fp_text reference REF** (at 0 -4) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -4) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 3a7a370c-fdc2-402f-8bbd-078ab0ef5fd2)
   )
-  (fp_text value BatteryHolder_Keystone_104_1x23mm (at 15 14) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_104_1x23mm" (at 15 14) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp eae70763-1791-4f7b-a5f4-edf07e057b1c)
   )
-  (fp_text user + (at 2.75 0) (layer F.SilkS)
+  (fp_text user "+" (at 2.75 0) (layer "F.SilkS")
     (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp a0632df0-25ee-411d-9e49-5fbc25d1f4ce)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 8db1bb16-70cd-43a5-a400-512f8f2d390e)
   )
-  (fp_line (start -1.45 1.8) (end -1.45 3) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 2.61 3.6) (angle -164) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 2.61 -3.6) (angle 164) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 2.1 3.8) (end 2.1 3.25) (angle 70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 2.1 -3.8) (end 2.1 -3.25) (angle -70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 2.85 3.5) (angle -164.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 2.1 3.8) (end 2.1 3) (angle 70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 2.85 -3.5) (angle 164.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 2.1 -3.8) (end 2.1 -3) (angle -70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 2.15 3.8) (end 2.15 2.9) (angle 70) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 3 3.5) (angle -164) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 3 -3.5) (angle 164) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 3.72 1.3) (angle -180) (layer F.Fab) (width 0.10))
-  (fp_line (start -1.75 -3.25) (end 2.15 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.75 3.25) (end 2.15 3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.75 3.25) (end -1.75 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.45 -3) (end 2.15 -3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.45 -1.8) (end -1.45 -3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.45 3) (end 2.15 3) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 9 1.3) (angle -170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 1.3) (angle -150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 -1.3) (angle 150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 -1.3) (angle 170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 3.72 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 2.15 -2.9) (end -0.9 -2.9) (layer F.Fab) (width 0.10))
-  (fp_line (start -0.9 2.9) (end 2.15 2.9) (layer F.Fab) (width 0.10))
-  (fp_line (start -1.3 -2.5) (end -1.3 2.5) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 1.3) (end 16.2 1.3) (layer F.Fab) (width 0.10))
-  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start 2.15 -3.8) (end 2.15 -2.9) (angle -70) (layer F.Fab) (width 0.10))
-  (fp_arc (start 16.2 0) (end 16.2 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 -1.3) (end 0 1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start -0.9 2.5) (end -1.3 2.5) (angle -90) (layer F.Fab) (width 0.10))
-  (fp_arc (start -0.9 -2.5) (end -1.3 -2.5) (angle 90) (layer F.Fab) (width 0.10))
-  (fp_line (start 23.7 7.85) (end 24.5 8.61) (layer F.Fab) (width 0.10))
-  (fp_line (start 23.7 -7.85) (end 24.5 -8.61) (layer F.Fab) (width 0.10))
-  (pad 2 thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_104_1x23mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -1.45 1.8) (end -1.45 3) (layer "F.SilkS") (width 0.12) (tstamp 33b6c2e3-0ddd-4e66-897b-9862c7dc9080))
+  (fp_line (start -1.45 -3) (end 2.15 -3) (layer "F.SilkS") (width 0.12) (tstamp 47ddba7c-2ed7-43d1-9926-f40b6b47acbe))
+  (fp_line (start -1.45 3) (end 2.15 3) (layer "F.SilkS") (width 0.12) (tstamp 9a65abf0-af87-464c-bde3-31b35a3e2a23))
+  (fp_line (start -1.45 -1.8) (end -1.45 -3) (layer "F.SilkS") (width 0.12) (tstamp d03191ab-201a-4282-b900-a0252962abd3))
+  (fp_arc (start 2.851754 -3.526384) (mid 2.558861 -3.144678) (end 2.1 -3) (layer "F.SilkS") (width 0.12) (tstamp 3196f9aa-4047-4f17-b67a-0952c2f95f8b))
+  (fp_arc (start 2.85 -3.5) (mid 17.002622 -12.709172) (end 28.03617 0.072313) (layer "F.SilkS") (width 0.12) (tstamp 560bc25a-bf1b-45b6-bfe3-78ac8c55142b))
+  (fp_arc (start 2.1 3) (mid 2.558861 3.144678) (end 2.851754 3.526384) (layer "F.SilkS") (width 0.12) (tstamp 91b31fef-c30f-4027-8ae7-710efe8b0172))
+  (fp_arc (start 28.03617 -0.072313) (mid 17.002622 12.709172) (end 2.85 3.5) (layer "F.SilkS") (width 0.12) (tstamp fc43fe9a-de7f-4511-946f-26edeb27a98c))
+  (fp_line (start -1.75 3.25) (end -1.75 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp 1fb3a683-c416-40df-bcad-fdf2e0d62f0a))
+  (fp_line (start -1.75 -3.25) (end 2.15 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp 26590794-e9c7-4855-b9c0-12ac7a8c8ce1))
+  (fp_line (start -1.75 3.25) (end 2.15 3.25) (layer "F.CrtYd") (width 0.05) (tstamp b30f9e36-0cf4-4d16-91eb-dc3867b93851))
+  (fp_arc (start 2.1 3.25) (mid 2.415467 3.349466) (end 2.616831 3.611889) (layer "F.CrtYd") (width 0.05) (tstamp 39ab26e2-b4da-4ad2-9654-1c111b64787b))
+  (fp_arc (start 28.294579 0.009732) (mid 17.012776 12.968498) (end 2.61 3.6) (layer "F.CrtYd") (width 0.05) (tstamp 8389889b-6f03-4a23-8fcd-c28fb0b833d5))
+  (fp_arc (start 2.61 -3.6) (mid 17.012776 -12.968498) (end 28.294579 -0.009732) (layer "F.CrtYd") (width 0.05) (tstamp aee5417b-b7fd-41f1-ad58-7a76c9a1562d))
+  (fp_arc (start 2.616831 -3.611889) (mid 2.415467 -3.349466) (end 2.1 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp ccba5386-6d73-456e-ac2f-8142435945d9))
+  (fp_line (start -1.3 -2.5) (end -1.3 2.5) (layer "F.Fab") (width 0.1) (tstamp 218075b7-1d3b-4e3f-8b3c-36af648ae9d1))
+  (fp_line (start 2.15 -2.9) (end -0.9 -2.9) (layer "F.Fab") (width 0.1) (tstamp 392bcc32-6bfb-4b33-ae8e-d338eb4d7f53))
+  (fp_line (start 0 1.3) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 4ae22e54-45b1-492f-8e3f-08cb2edfc2d6))
+  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer "F.Fab") (width 0.1) (tstamp 54254408-a922-4de7-b5b2-310714c6f960))
+  (fp_line (start 23.7 -7.85) (end 24.5 -8.61) (layer "F.Fab") (width 0.1) (tstamp 5ebafc8e-30f9-4153-9fe6-3ed7ba4cbcff))
+  (fp_line (start -0.9 2.9) (end 2.15 2.9) (layer "F.Fab") (width 0.1) (tstamp 711518d5-0122-421d-b1fa-8308f614aff6))
+  (fp_line (start 23.7 7.85) (end 24.5 8.61) (layer "F.Fab") (width 0.1) (tstamp b8f61724-194c-45bd-a46b-9698b7f47745))
+  (fp_line (start 0 -1.3) (end 0 1.3) (layer "F.Fab") (width 0.1) (tstamp d0af1157-9222-4361-a91e-2c714e115751))
+  (fp_arc (start 26.68 -1.3) (mid 16.5 11.48) (end 3.72 1.3) (layer "F.Fab") (width 0.1) (tstamp 1299df1a-e358-45b5-be00-ca9b79d5477e))
+  (fp_arc (start 16.2 -1.3) (mid 17.5 0) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 157c15e5-62ca-4a46-832b-5b1c02c723c1))
+  (fp_arc (start -0.9 2.9) (mid -1.182843 2.782843) (end -1.3 2.5) (layer "F.Fab") (width 0.1) (tstamp 164555e3-26ad-462d-90b4-617448c51c63))
+  (fp_arc (start 17.495448 -0.175833) (mid 15.963947 2.171724) (end 13.3 1.3) (layer "F.Fab") (width 0.1) (tstamp 4aab2d8b-d827-40d8-b043-1bb4b9d65cbb))
+  (fp_arc (start 3.72 -1.3) (mid 16.5 -11.48) (end 26.68 1.3) (layer "F.Fab") (width 0.1) (tstamp 7eda1b8f-eeed-436a-97f9-1012fca6a230))
+  (fp_arc (start -1.3 -2.5) (mid -1.182843 -2.782843) (end -0.9 -2.9) (layer "F.Fab") (width 0.1) (tstamp 81f553fd-8843-4b36-a6b1-f9f312c9dcb0))
+  (fp_arc (start 2.15 2.9) (mid 2.666219 3.062763) (end 2.995723 3.492182) (layer "F.Fab") (width 0.1) (tstamp 93de8669-15ee-4cac-81ab-ddd0b7d9f94c))
+  (fp_arc (start 9 -1.3) (mid 15.954687 -6.28971) (end 21.531551 0.203631) (layer "F.Fab") (width 0.1) (tstamp 9f26474a-29b3-4e81-a412-de0b4334033d))
+  (fp_arc (start 21.531551 -0.203631) (mid 15.954687 6.28971) (end 9 1.3) (layer "F.Fab") (width 0.1) (tstamp a26f1f3a-f087-4598-87d1-012ea400514e))
+  (fp_arc (start 2.995723 -3.492182) (mid 2.666219 -3.062763) (end 2.15 -2.9) (layer "F.Fab") (width 0.1) (tstamp d9abcc8f-7992-4689-83d0-853282fc8eff))
+  (fp_arc (start 3 -3.5) (mid 16.968026 -12.568376) (end 27.892123 0.00164) (layer "F.Fab") (width 0.1) (tstamp ec29cb96-2fd2-487e-8782-fb0ddfc15ce6))
+  (fp_arc (start 13.3 -1.3) (mid 15.963947 -2.171724) (end 17.495448 0.175833) (layer "F.Fab") (width 0.1) (tstamp f8e45495-4e72-4c35-8576-fb3db2fcc10d))
+  (fp_arc (start 27.892123 -0.00164) (mid 16.968026 12.568376) (end 3 3.5) (layer "F.Fab") (width 0.1) (tstamp f92a2324-a542-4b6b-b976-9e1c18376902))
+  (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp df630b1c-e6bb-46c0-ab38-d133de6998d1))
+  (pad "2" thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp 278156a0-c9fd-43e2-8c9e-9389df87b52f))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_104_1x23mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_1058_1x2032.kicad_mod

@@ -1,65 +1,70 @@
-(module BatteryHolder_Keystone_1058_1x2032 (layer F.Cu) (tedit 589EE147)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=14028)
+(footprint "BatteryHolder_Keystone_1058_1x2032" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 589EE147)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=14028")
   (tags "Keystone type 1058 coin cell retainer")
   (attr smd)
-  (fp_text reference REF** (at 0 7.62) (layer F.SilkS)
+  (fp_text reference "REF**" (at 0 7.62) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 92c31e48-24ea-4514-b40a-d0459409bcae)
   )
-  (fp_text value BatteryHolder_Keystone_1058_1x2032 (at 0 -9.398) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_1058_1x2032" (at 0 -9.398) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2377f8e0-d5c1-4dee-9904-4c448de00532)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 6cb3b56f-d128-4590-82e0-658da68dd009)
   )
-  (fp_arc (start 0 0) (end 11.06 4.11) (angle 139.2) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 0) (end -11.06 -4.11) (angle 139.2) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.06 4.11) (end 16.45 4.11) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 16.45 4.11) (end 16.45 -4.11) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 16.45 -4.11) (end 11.06 -4.11) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -16.45 -4.11) (end -11.06 -4.11) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -16.45 -4.11) (end -16.45 4.11) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -16.45 4.11) (end -11.06 4.11) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 0) (end -10.692 3.61) (angle -27.3) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 0) (end 10.692 -3.61) (angle -27.3) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 0) (end 10.692 3.61) (angle 27.3) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 0) (end -10.692 -3.61) (angle 27.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -14.31 1.9) (end -14.31 3.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start -10.692 3.61) (end -14.31 3.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.86 8.11) (end -7.8473 8.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.66 5.91) (end -3.86 8.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.66 5.91) (end -1.66 5.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.66 5.91) (end 3.86 8.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start 7.8473 8.11) (end 3.86 8.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.31 1.9) (end 14.31 3.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.31 3.61) (end 10.692 3.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start 10.692 -3.61) (end 14.31 -3.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.31 -1.9) (end 14.31 -3.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start -7.8473 -8.11) (end 7.8473 -8.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -14.31 -1.9) (end -14.31 -3.61) (layer F.SilkS) (width 0.12))
-  (fp_line (start -14.31 -3.61) (end -10.692 -3.61) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 0) (end -10.61275 3.5) (angle -27.4635) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 0) (end 10.61275 -3.5) (angle -27.4635) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 0) (end 10.61275 3.5) (angle 27.4635) (layer F.Fab) (width 0.1))
-  (fp_line (start 14.2 1.9) (end 14.2 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 14.2 3.5) (end 10.61275 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 10.61275 -3.5) (end 14.2 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 14.2 -3.5) (end 14.2 -1.9) (layer F.Fab) (width 0.1))
-  (fp_line (start -14.2 1.9) (end -14.2 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -14.2 3.5) (end -10.61275 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.9 8) (end 7.8026 8) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.7 5.8) (end 3.9 8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.7 5.8) (end -3.9 8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.7 5.8) (end 1.7 5.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -14.2 -3.5) (end -10.61275 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -14.2 -3.5) (end -14.2 -1.9) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.9 8) (end -7.8026 8) (layer F.Fab) (width 0.1))
-  (fp_line (start -7.8026 -8) (end 7.8026 -8) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 0) (end -10.61275 -3.5) (angle 27.4635) (layer F.Fab) (width 0.1))
-  (fp_circle (center 0 0) (end 10 0) (layer Dwgs.User) (width 0.15))
-  (pad 1 smd rect (at -14.68 0) (size 2.54 3.51) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 14.68 0) (size 2.54 3.51) (layers F.Cu F.Paste F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_1058_1x2032.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -1.66 5.91) (end -3.86 8.11) (layer "F.SilkS") (width 0.12) (tstamp 08a7656f-6303-4608-b72d-6c62e91d8f50))
+  (fp_line (start 14.31 -1.9) (end 14.31 -3.61) (layer "F.SilkS") (width 0.12) (tstamp 24d5c9d3-ba9a-42d0-95d3-137c01331a0b))
+  (fp_line (start -14.31 1.9) (end -14.31 3.61) (layer "F.SilkS") (width 0.12) (tstamp 373bd9c0-c6b1-4ba8-aaab-c685dae0ae09))
+  (fp_line (start 1.66 5.91) (end -1.66 5.91) (layer "F.SilkS") (width 0.12) (tstamp 3bba8bd7-7d8c-48d2-b922-0d0b98a7459b))
+  (fp_line (start -7.8473 -8.11) (end 7.8473 -8.11) (layer "F.SilkS") (width 0.12) (tstamp 5535bafa-5b17-40cc-b799-523756d532e8))
+  (fp_line (start 14.31 3.61) (end 10.692 3.61) (layer "F.SilkS") (width 0.12) (tstamp 9933cb18-5919-40b8-a75e-d78916b5fc45))
+  (fp_line (start 10.692 -3.61) (end 14.31 -3.61) (layer "F.SilkS") (width 0.12) (tstamp ba210774-2e90-429a-89cc-c9e7a7933157))
+  (fp_line (start -10.692 3.61) (end -14.31 3.61) (layer "F.SilkS") (width 0.12) (tstamp d7e572e8-04c9-40d9-8089-de4684ff9ec7))
+  (fp_line (start 7.8473 8.11) (end 3.86 8.11) (layer "F.SilkS") (width 0.12) (tstamp dd076414-f59d-4717-a789-6a05e2fea55d))
+  (fp_line (start 1.66 5.91) (end 3.86 8.11) (layer "F.SilkS") (width 0.12) (tstamp ebfce06e-a9e0-4591-a0db-4f9bdf12e222))
+  (fp_line (start -14.31 -3.61) (end -10.692 -3.61) (layer "F.SilkS") (width 0.12) (tstamp f60c5e1d-fb2d-45eb-b636-98212aed18a3))
+  (fp_line (start -14.31 -1.9) (end -14.31 -3.61) (layer "F.SilkS") (width 0.12) (tstamp f61daccd-b536-437a-96dd-ab3b6e11d260))
+  (fp_line (start -3.86 8.11) (end -7.8473 8.11) (layer "F.SilkS") (width 0.12) (tstamp fe7aacb1-e0ec-48f6-9d3b-54239b2ee52a))
+  (fp_line (start 14.31 1.9) (end 14.31 3.61) (layer "F.SilkS") (width 0.12) (tstamp ff636c31-1ea7-4b01-80f4-452a484dbd0e))
+  (fp_arc (start 10.692 3.61) (mid 9.538084 6.031244) (end 7.845371 8.111789) (layer "F.SilkS") (width 0.12) (tstamp 1721a79e-f5fc-4fa6-945f-09065b5578af))
+  (fp_arc (start 7.845371 -8.111789) (mid 9.538085 -6.031244) (end 10.692 -3.61) (layer "F.SilkS") (width 0.12) (tstamp 3fc2fbcb-b75e-493b-9a5f-d7433ee33f20))
+  (fp_arc (start -10.692 -3.61) (mid -9.538084 -6.031244) (end -7.845371 -8.111789) (layer "F.SilkS") (width 0.12) (tstamp 92351664-e3c6-4a45-b5b0-d8ce85a9c4d9))
+  (fp_arc (start -7.845371 8.111789) (mid -9.538085 6.031244) (end -10.692 3.61) (layer "F.SilkS") (width 0.12) (tstamp d5f13f91-a503-4098-9cee-bb65fed90a98))
+  (fp_circle (center 0 0) (end 10 0) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 9fe65b5f-3438-4978-9e31-ec622814910d))
+  (fp_line (start 16.45 4.11) (end 16.45 -4.11) (layer "F.CrtYd") (width 0.05) (tstamp 320f03e1-52f9-4f09-8ffa-20984abfcc84))
+  (fp_line (start 16.45 -4.11) (end 11.06 -4.11) (layer "F.CrtYd") (width 0.05) (tstamp 4bfa6483-2039-45ab-a343-84106cb50dc3))
+  (fp_line (start -16.45 -4.11) (end -11.06 -4.11) (layer "F.CrtYd") (width 0.05) (tstamp 89932138-ef36-4b31-a079-4bf522a25b3d))
+  (fp_line (start -16.45 -4.11) (end -16.45 4.11) (layer "F.CrtYd") (width 0.05) (tstamp c73cdb81-0d15-4b6a-8e02-14e0d1095b20))
+  (fp_line (start 11.06 4.11) (end 16.45 4.11) (layer "F.CrtYd") (width 0.05) (tstamp c847934c-d4be-4409-8ee2-27c1195a0181))
+  (fp_line (start -16.45 4.11) (end -11.06 4.11) (layer "F.CrtYd") (width 0.05) (tstamp faa596fa-2204-46da-b3e5-7d3930ef67eb))
+  (fp_arc (start -11.06 -4.11) (mid -0.002978 -11.79897) (end 11.057924 -4.115582) (layer "F.CrtYd") (width 0.05) (tstamp 6c134378-dcaf-4624-8ac6-bc34705e7de1))
+  (fp_arc (start 11.06 4.11) (mid 0.002978 11.79897) (end -11.057924 4.115582) (layer "F.CrtYd") (width 0.05) (tstamp b2d02d2a-d06a-465a-8d73-155a200dbe24))
+  (fp_line (start 1.7 5.8) (end 3.9 8) (layer "F.Fab") (width 0.1) (tstamp 23c3e220-6f7d-4e94-84fd-5d7abdc8affa))
+  (fp_line (start 10.61275 -3.5) (end 14.2 -3.5) (layer "F.Fab") (width 0.1) (tstamp 271bea4d-f321-463e-95e2-b426f4bd163d))
+  (fp_line (start 3.9 8) (end 7.8026 8) (layer "F.Fab") (width 0.1) (tstamp 2fc6743a-7a19-436f-9b1e-3969c9c99724))
+  (fp_line (start 14.2 -3.5) (end 14.2 -1.9) (layer "F.Fab") (width 0.1) (tstamp 44684d77-e8ff-4c35-9546-d443b06f9973))
+  (fp_line (start -14.2 3.5) (end -10.61275 3.5) (layer "F.Fab") (width 0.1) (tstamp 5994f93f-0caa-4038-8b58-7abe6ad4ee7c))
+  (fp_line (start -7.8026 -8) (end 7.8026 -8) (layer "F.Fab") (width 0.1) (tstamp 773851cb-f891-465b-812a-9aea6e1caec5))
+  (fp_line (start 14.2 1.9) (end 14.2 3.5) (layer "F.Fab") (width 0.1) (tstamp 77b56dcb-61fe-4e9d-9f64-970cac1b0bdc))
+  (fp_line (start -14.2 1.9) (end -14.2 3.5) (layer "F.Fab") (width 0.1) (tstamp 89daff28-b81c-470c-888e-2325717579e9))
+  (fp_line (start 14.2 3.5) (end 10.61275 3.5) (layer "F.Fab") (width 0.1) (tstamp 8d8881f5-dc19-4140-b26d-0ea81df00107))
+  (fp_line (start -3.9 8) (end -7.8026 8) (layer "F.Fab") (width 0.1) (tstamp a9d39541-326d-45aa-897e-62648cfdbd2a))
+  (fp_line (start -14.2 -3.5) (end -14.2 -1.9) (layer "F.Fab") (width 0.1) (tstamp b56dc73f-29d9-41fe-985c-341fabd796fd))
+  (fp_line (start -1.7 5.8) (end -3.9 8) (layer "F.Fab") (width 0.1) (tstamp c0a868e2-6fc5-4f8b-9253-c06b7d84f2d7))
+  (fp_line (start -14.2 -3.5) (end -10.61275 -3.5) (layer "F.Fab") (width 0.1) (tstamp ccc0a798-43fb-4256-8fa3-dcf9d5366f80))
+  (fp_line (start -1.7 5.8) (end 1.7 5.8) (layer "F.Fab") (width 0.1) (tstamp e6ae6c1f-2c4d-4494-b2c9-d1303bd02f34))
+  (fp_arc (start 7.802602 -7.999992) (mid 9.478596 -5.91918) (end 10.61275 -3.5) (layer "F.Fab") (width 0.1) (tstamp 20aeb6ad-b0e3-4534-970b-a0414429ec17))
+  (fp_arc (start -7.802602 7.999992) (mid -9.478596 5.91918) (end -10.61275 3.5) (layer "F.Fab") (width 0.1) (tstamp 732b32a7-be36-4720-a54b-0f9745dc6adb))
+  (fp_arc (start 10.61275 3.5) (mid 9.478596 5.919179) (end 7.802602 7.999992) (layer "F.Fab") (width 0.1) (tstamp 8d9ebb4e-c566-47da-9236-475ba658bb90))
+  (fp_arc (start -10.61275 -3.5) (mid -9.478596 -5.919179) (end -7.802602 -7.999992) (layer "F.Fab") (width 0.1) (tstamp d7db8996-c40c-4f4c-bbc2-684835df9c23))
+  (pad "1" smd rect (at -14.68 0) (size 2.54 3.51) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a75f7b9b-49b0-47a4-afce-4ec81310b06a))
+  (pad "2" smd rect (at 14.68 0) (size 2.54 3.51) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp f2eb23d3-6cac-4e63-b9f3-cdb31f08a962))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_1058_1x2032.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_105_1x2430.kicad_mod

@@ -1,61 +1,68 @@
-(module BatteryHolder_Keystone_105_1x2430 (layer F.Cu) (tedit 5787C363)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=745)
+(footprint "BatteryHolder_Keystone_105_1x2430" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5787C363)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=745")
   (tags "Keystone type 105 battery holder")
-  (fp_text reference REF** (at -1.25 -4.5) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -1.25 -4.5) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 3085d2da-fbee-4628-be96-3f88d0d39d3e)
   )
-  (fp_text value BatteryHolder_Keystone_105_1x2430 (at 15 15) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_105_1x2430" (at 15 15) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp b53ace28-5ee2-47c5-9258-731702e955ef)
   )
-  (fp_text user + (at 2.75 0) (layer F.SilkS)
+  (fp_text user "+" (at 2.75 0) (layer "F.SilkS")
     (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 2cd512a3-f056-49e9-9fc7-a6adae5e5bff)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 74526a9e-cd9c-4379-aeb9-a9a40a04f4d9)
   )
-  (fp_arc (start 15.2 0) (end 1.65 3.52) (angle -165.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 1.8 3.5) (angle -165.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 1.65 -3.52) (angle 165.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 1.8 -3.5) (angle 165.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 3.8) (end 0.95 3.05) (angle 70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0.95 3.8) (end 0.95 2.9) (angle 70) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -3.05) (angle -70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -2.9) (angle -70) (layer F.Fab) (width 0.10))
-  (fp_line (start 0.95 -3.05) (end -1.5 -3.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.5 3.05) (end 0.95 3.05) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -1.5 -2.5) (end -2.05 -2.5) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -1.5 2.5) (end -2.05 2.5) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.05 -2.5) (end -2.05 2.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.95 -2.9) (end -1.5 -2.9) (layer F.Fab) (width 0.10))
-  (fp_line (start -1.5 2.9) (end 0.95 2.9) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 2.5) (end -1.9 2.5) (angle -90) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 -2.5) (end -2.3 -2.5) (angle 90) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.3 -2.5) (end -2.3 2.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0.95 3.8) (end 0.95 3.3) (angle 70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 1.41 3.6) (angle -165.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 1.41 -3.6) (angle 165.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 2.75 1.3) (angle -180) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 1.3) (angle -170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 1.3) (angle -150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 -1.3) (angle 150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 -1.3) (angle 170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 2.75 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0.95 -3.3) (end -1.5 -3.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.5 3.3) (end 0.95 3.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.9 -2.5) (end -1.9 2.5) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 1.3) (end 16.2 1.3) (layer F.Fab) (width 0.10))
-  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -3.3) (angle -70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 16.2 0) (end 16.2 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 -1.3) (end 0 1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 2.5) (end -2.3 2.5) (angle -90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -1.5 -2.5) (end -1.9 -2.5) (angle 90) (layer F.Fab) (width 0.10))
-  (fp_line (start 24.4094 8.4963) (end 25.3746 9.398) (layer F.Fab) (width 0.10))
-  (fp_line (start 24.384 -8.5471) (end 25.2992 -9.3988) (layer F.Fab) (width 0.10))
-  (pad 2 thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_105_1x2430.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -1.5 3.05) (end 0.95 3.05) (layer "F.SilkS") (width 0.12) (tstamp 26bdd675-8f77-4291-bb95-121ab002725f))
+  (fp_line (start -2.05 -2.5) (end -2.05 2.5) (layer "F.SilkS") (width 0.12) (tstamp 6f980d7f-f426-41cf-a1ed-e4e6ac812f4a))
+  (fp_line (start 0.95 -3.05) (end -1.5 -3.05) (layer "F.SilkS") (width 0.12) (tstamp ef7c866a-c019-4f10-895d-62e8f0b9628a))
+  (fp_arc (start 1.65 -3.52) (mid 16.981862 -13.885887) (end 29.199738 0.015231) (layer "F.SilkS") (width 0.12) (tstamp 112ffde2-138c-4bf4-9d56-2e2e18561038))
+  (fp_arc (start -1.5 3.05) (mid -1.888909 2.888909) (end -2.05 2.5) (layer "F.SilkS") (width 0.12) (tstamp a0cf2577-3efe-4e04-bcc3-c38ca5bbcff5))
+  (fp_arc (start -2.05 -2.5) (mid -1.888909 -2.888909) (end -1.5 -3.05) (layer "F.SilkS") (width 0.12) (tstamp b5d36ec8-3dfe-4af0-a962-d4c2c8d90bf3))
+  (fp_arc (start 1.654769 -3.543485) (mid 1.380182 -3.185636) (end 0.95 -3.05) (layer "F.SilkS") (width 0.12) (tstamp be2be2ff-bffd-45ed-83d5-56d76dccd15f))
+  (fp_arc (start 29.199738 -0.015231) (mid 16.981862 13.885887) (end 1.65 3.52) (layer "F.SilkS") (width 0.12) (tstamp f67b6ba9-1ed5-4099-a725-53d08d6418bf))
+  (fp_arc (start 0.95 3.05) (mid 1.380182 3.185636) (end 1.654769 3.543485) (layer "F.SilkS") (width 0.12) (tstamp fe830f42-c15c-44b9-856d-e6eb7a4a877e))
+  (fp_line (start 0.95 -3.3) (end -1.5 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 2b8fbe5b-5751-4171-b601-b13c340d5adb))
+  (fp_line (start -2.3 -2.5) (end -2.3 2.5) (layer "F.CrtYd") (width 0.05) (tstamp 98d46ee2-e350-4248-b6b7-3724f0561cd0))
+  (fp_line (start -1.5 3.3) (end 0.95 3.3) (layer "F.CrtYd") (width 0.05) (tstamp e5cfeca5-6a27-4065-84cb-12e43413a5a2))
+  (fp_arc (start -2.3 -2.5) (mid -2.065685 -3.065685) (end -1.5 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 02b2b813-9b93-4dbc-afde-47908ce55b42))
+  (fp_arc (start 29.452124 -0.032591) (mid 17.030934 14.134065) (end 1.41 3.6) (layer "F.CrtYd") (width 0.05) (tstamp 1c5bba0a-6db0-4947-8d8e-24033875d160))
+  (fp_arc (start 0.95 3.3) (mid 1.236788 3.390424) (end 1.419846 3.62899) (layer "F.CrtYd") (width 0.05) (tstamp aafded9d-6552-4ee7-8cf2-73dd0abf3e2b))
+  (fp_arc (start 1.41 -3.6) (mid 17.030934 -14.134065) (end 29.452124 0.032591) (layer "F.CrtYd") (width 0.05) (tstamp cc0d1dd7-3f01-4450-87a3-b189f67d3dbd))
+  (fp_arc (start 1.419846 -3.62899) (mid 1.236788 -3.390424) (end 0.95 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp d2c0e932-b654-4570-b267-379d4791cfbb))
+  (fp_arc (start -1.5 3.3) (mid -2.065685 3.065685) (end -2.3 2.5) (layer "F.CrtYd") (width 0.05) (tstamp d41fccea-e5fa-4121-b39f-2ea4875dd925))
+  (fp_line (start 0 -1.3) (end 0 1.3) (layer "F.Fab") (width 0.1) (tstamp 0410f556-e13b-4afa-8547-60566627470c))
+  (fp_line (start 24.384 -8.5471) (end 25.2992 -9.3988) (layer "F.Fab") (width 0.1) (tstamp 25243ba7-cbe1-48eb-b1a4-13280d505c26))
+  (fp_line (start 24.4094 8.4963) (end 25.3746 9.398) (layer "F.Fab") (width 0.1) (tstamp 4cc2128a-ace6-4194-bdad-e84c77e58031))
+  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer "F.Fab") (width 0.1) (tstamp 77df4824-7b6e-4846-8cdb-04629da38a86))
+  (fp_line (start 0 1.3) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 8e5c192b-db99-4aaa-8443-681ce41e1825))
+  (fp_line (start 0.95 -2.9) (end -1.5 -2.9) (layer "F.Fab") (width 0.1) (tstamp 9d5c24c4-ca38-4621-b408-1dcd424a0a60))
+  (fp_line (start -1.5 2.9) (end 0.95 2.9) (layer "F.Fab") (width 0.1) (tstamp b6513983-3b60-42ce-9159-c09207a49006))
+  (fp_line (start -1.9 -2.5) (end -1.9 2.5) (layer "F.Fab") (width 0.1) (tstamp ec73ca81-8498-42c0-b14a-03a8e6056e44))
+  (fp_arc (start 0.95 2.9) (mid 1.466219 3.062763) (end 1.795723 3.492182) (layer "F.Fab") (width 0.1) (tstamp 152c6909-03a8-4220-9555-e5e10e95af34))
+  (fp_arc (start 2.75 -1.3) (mid 16.5 -12.45) (end 27.65 1.3) (layer "F.Fab") (width 0.1) (tstamp 5b27caed-8963-4125-b7e7-c0a4b482df04))
+  (fp_arc (start 21.531551 -0.203631) (mid 15.954687 6.28971) (end 9 1.3) (layer "F.Fab") (width 0.1) (tstamp 84a0ea53-cf25-420d-a598-8386381c9606))
+  (fp_arc (start 29.049508 -0.033425) (mid 16.980951 13.734562) (end 1.8 3.5) (layer "F.Fab") (width 0.1) (tstamp 8f54d40f-c71d-4c39-b695-fccbf8a2604a))
+  (fp_arc (start 17.495448 -0.175833) (mid 15.963947 2.171724) (end 13.3 1.3) (layer "F.Fab") (width 0.1) (tstamp bcc7437c-06dd-4e57-83bc-7f079942fd04))
+  (fp_arc (start -1.5 2.9) (mid -1.782843 2.782843) (end -1.9 2.5) (layer "F.Fab") (width 0.1) (tstamp c18814c7-768b-4091-8083-fc59591928a5))
+  (fp_arc (start 27.65 -1.3) (mid 16.5 12.45) (end 2.75 1.3) (layer "F.Fab") (width 0.1) (tstamp d4f4ae45-7290-4257-9d6d-44535571cfa0))
+  (fp_arc (start 16.2 -1.3) (mid 17.5 0) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp dd1f71a0-856a-4480-ae78-314d1679fb75))
+  (fp_arc (start 1.795723 -3.492182) (mid 1.466219 -3.062763) (end 0.95 -2.9) (layer "F.Fab") (width 0.1) (tstamp e2aaa752-139e-41c9-894e-6c6c6701f37b))
+  (fp_arc (start 1.8 -3.5) (mid 16.980951 -13.734563) (end 29.049508 0.033425) (layer "F.Fab") (width 0.1) (tstamp e9f35a97-8143-4e4c-acc7-e6273d23e517))
+  (fp_arc (start -1.9 -2.5) (mid -1.782843 -2.782843) (end -1.5 -2.9) (layer "F.Fab") (width 0.1) (tstamp ea774d22-88b7-4e3b-b1fc-0ec7ef3e5b0d))
+  (fp_arc (start 9 -1.3) (mid 15.954687 -6.28971) (end 21.531551 0.203631) (layer "F.Fab") (width 0.1) (tstamp fc6cd06c-b048-4374-ad42-1f30fe1beecc))
+  (fp_arc (start 13.3 -1.3) (mid 15.963947 -2.171724) (end 17.495448 0.175833) (layer "F.Fab") (width 0.1) (tstamp fd641dd6-a939-414d-9eb1-bcca4520346b))
+  (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp 1c584b75-4db8-4114-b22c-708545e34354))
+  (pad "2" thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp 22d24619-9a48-4f77-bae4-d00a4fc00f1e))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_105_1x2430.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_1060_1x2032.kicad_mod

@@ -1,75 +1,80 @@
-(module BatteryHolder_Keystone_1060_1x2032 (layer F.Cu) (tedit 5B98EF5E)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=726)
+(footprint "BatteryHolder_Keystone_1060_1x2032" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5B98EF5E)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=726")
   (tags "CR2032 BR2032 BatteryHolder Battery")
   (attr smd)
-  (fp_text reference REF** (at -14.125 -5.3) (layer F.SilkS)
+  (fp_text reference "REF**" (at -14.125 -5.3) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2cc7bbea-05e0-46aa-87da-5e78b1ad4d55)
   )
-  (fp_text value BatteryHolder_Keystone_1060_1x2032 (at 0 -11.75) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_1060_1x2032" (at 0 -11.75) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 858c0f5d-dcfb-4b27-b020-2ea1e1a5522e)
   )
-  (fp_circle (center 0 0) (end -10.2 0) (layer Dwgs.User) (width 0.3))
-  (fp_line (start 11 8) (end -9.4 8) (layer F.Fab) (width 0.1))
-  (fp_line (start 11 -8) (end -11 -8) (layer F.Fab) (width 0.1))
-  (fp_line (start 11 8) (end 11 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 11 -8) (end 11 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -11 -8) (end -11 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -11 6.4) (end -11 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -11 3.5) (end -14.2 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -14.2 3.5) (end -14.2 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -14.2 -3.5) (end -11 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 11 3.5) (end 14.2 3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 14.2 3.5) (end 14.2 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 14.2 -3.5) (end 11 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -9.4 8) (end -11 6.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 11.35 3.85) (end 14.55 3.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.55 3.85) (end 14.55 2.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 11.35 8.35) (end 11.35 3.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start 11.35 8.35) (end -9.55 8.35) (layer F.SilkS) (width 0.12))
-  (fp_line (start -11.35 6.55) (end -11.35 3.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start -9.55 8.35) (end -11.35 6.55) (layer F.SilkS) (width 0.12))
-  (fp_line (start -11.35 3.85) (end -14.55 3.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start -14.55 3.85) (end -14.55 2.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -11.35 -3.85) (end -14.55 -3.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start -14.55 -3.85) (end -14.55 -2.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 11.35 -3.85) (end 14.55 -3.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.55 -3.85) (end 14.55 -2.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -11.35 -8.35) (end 11.35 -8.35) (layer F.SilkS) (width 0.12))
-  (fp_line (start -11.35 -8.35) (end -11.35 -3.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start 11.35 -8.35) (end 11.35 -3.85) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 0) (end -6.5 8.5) (angle -74.81070976) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.5 8.5) (end 6.5 8.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -6.5 8.5) (end -11.5 8.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -11.5 4) (end -11.5 8.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.7 4) (end -11.5 4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.7 4) (end -14.7 2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.7 2.3) (end -16.45 2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -16.45 2.3) (end -16.45 -2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.7 -2.3) (end -16.45 -2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.7 -2.3) (end -14.7 -4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -14.7 -4) (end -11.5 -4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -11.5 -4) (end -11.5 -8.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -11.5 -8.5) (end -6.5 -8.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.5 -8.5) (end 11.5 -4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.5 -4) (end 14.7 -4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 14.7 -4) (end 14.7 -2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 14.7 -2.3) (end 16.45 -2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 16.45 -2.3) (end 16.45 2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 16.45 2.3) (end 14.7 2.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 14.7 2.3) (end 14.7 4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 14.7 4) (end 11.5 4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.5 4) (end 11.5 8.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 0) (end 6.5 -8.5) (angle -74.81070976) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.5 -8.5) (end 6.5 -8.5) (layer F.CrtYd) (width 0.05))
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 0d869afe-0aa8-4598-aaf0-e8b77d998f0f)
   )
-  (fp_line (start -13 5) (end -13 7) (layer F.SilkS) (width 0.12))
-  (fp_line (start -12 6) (end -14 6) (layer F.SilkS) (width 0.12))
-  (pad 2 smd rect (at 14.65 0 180) (size 2.6 3.6) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd rect (at -14.65 0 180) (size 2.6 3.6) (layers F.Cu F.Paste F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_1060_1x2032.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -14.55 3.85) (end -14.55 2.3) (layer "F.SilkS") (width 0.12) (tstamp 0b4f0a90-e6a2-4c86-bab0-e53dcee6916f))
+  (fp_line (start -11.35 3.85) (end -14.55 3.85) (layer "F.SilkS") (width 0.12) (tstamp 1fda3e1b-47b5-40f1-a7d2-d09c42811098))
+  (fp_line (start -14.55 -3.85) (end -14.55 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 32b812c5-91c1-4096-9787-423190c1e338))
+  (fp_line (start 11.35 8.35) (end 11.35 3.85) (layer "F.SilkS") (width 0.12) (tstamp 3b061f1a-52f5-4838-a2d4-466e2c32f0b0))
+  (fp_line (start -9.55 8.35) (end -11.35 6.55) (layer "F.SilkS") (width 0.12) (tstamp 57179c3e-3694-4e3a-a813-cc914ba5015f))
+  (fp_line (start -11.35 6.55) (end -11.35 3.85) (layer "F.SilkS") (width 0.12) (tstamp 5c6540fe-3fa7-433f-a5d0-9a54d00fab6e))
+  (fp_line (start 14.55 3.85) (end 14.55 2.3) (layer "F.SilkS") (width 0.12) (tstamp 61a95b7f-e738-42ec-9efb-414204a3af52))
+  (fp_line (start 14.55 -3.85) (end 14.55 -2.3) (layer "F.SilkS") (width 0.12) (tstamp 73f3d3da-3340-4538-a53d-4f1149b1e8bb))
+  (fp_line (start 11.35 -3.85) (end 14.55 -3.85) (layer "F.SilkS") (width 0.12) (tstamp 7a0f0a9b-e3ef-47b0-b107-cb22f399735f))
+  (fp_line (start -11.35 -8.35) (end -11.35 -3.85) (layer "F.SilkS") (width 0.12) (tstamp 7ad6f012-4970-4a09-b40a-63a0f92e07c1))
+  (fp_line (start -13 5) (end -13 7) (layer "F.SilkS") (width 0.12) (tstamp 8e531bf1-7bf1-4b06-b9ac-2cb2a137d8af))
+  (fp_line (start 11.35 -8.35) (end 11.35 -3.85) (layer "F.SilkS") (width 0.12) (tstamp 9f689f62-9ab9-48d9-9a77-0df2d71b375c))
+  (fp_line (start -11.35 -3.85) (end -14.55 -3.85) (layer "F.SilkS") (width 0.12) (tstamp a4fd08c0-bcf0-4e17-aed1-73b78ca29176))
+  (fp_line (start -11.35 -8.35) (end 11.35 -8.35) (layer "F.SilkS") (width 0.12) (tstamp c14fa4f4-0a84-4def-91a9-27be8966a8e0))
+  (fp_line (start 11.35 8.35) (end -9.55 8.35) (layer "F.SilkS") (width 0.12) (tstamp f1beb17c-25b3-4079-aecc-d35017abf618))
+  (fp_line (start 11.35 3.85) (end 14.55 3.85) (layer "F.SilkS") (width 0.12) (tstamp f5ea1056-4508-4b35-8354-40da58c851b8))
+  (fp_line (start -12 6) (end -14 6) (layer "F.SilkS") (width 0.12) (tstamp fd0836f0-8a66-4354-9c0c-32ab4b93ac17))
+  (fp_circle (center 0 0) (end -10.2 0) (layer "Dwgs.User") (width 0.3) (fill none) (tstamp be99933e-ea05-4f96-909c-50ccc79828d7))
+  (fp_line (start -14.7 -4) (end -11.5 -4) (layer "F.CrtYd") (width 0.05) (tstamp 23f980de-aa9e-4ddf-8f78-a9a7a32a0765))
+  (fp_line (start 14.7 -2.3) (end 16.45 -2.3) (layer "F.CrtYd") (width 0.05) (tstamp 272738cc-08f4-425a-b22a-a91616c2dee0))
+  (fp_line (start 11.5 -8.5) (end 6.5 -8.5) (layer "F.CrtYd") (width 0.05) (tstamp 4d679564-bfa5-4033-8fbf-1c3c2020cff5))
+  (fp_line (start 14.7 2.3) (end 14.7 4) (layer "F.CrtYd") (width 0.05) (tstamp 4f0c250c-dfb3-43a1-bf31-395e7d8fc55a))
+  (fp_line (start 14.7 -4) (end 14.7 -2.3) (layer "F.CrtYd") (width 0.05) (tstamp 5239188e-4295-48a4-9fdf-856447f73835))
+  (fp_line (start 16.45 -2.3) (end 16.45 2.3) (layer "F.CrtYd") (width 0.05) (tstamp 62c4d894-2617-4460-82df-d2ae4c202554))
+  (fp_line (start -14.7 4) (end -11.5 4) (layer "F.CrtYd") (width 0.05) (tstamp 639817b3-c3ca-48c5-88fa-77617ad14405))
+  (fp_line (start 11.5 8.5) (end 6.5 8.5) (layer "F.CrtYd") (width 0.05) (tstamp 7d6a5827-3110-48a9-b5ea-589e3eaf378d))
+  (fp_line (start -11.5 -4) (end -11.5 -8.5) (layer "F.CrtYd") (width 0.05) (tstamp 967dcdf6-efad-4d80-9e54-4825c821e9ab))
+  (fp_line (start -11.5 -8.5) (end -6.5 -8.5) (layer "F.CrtYd") (width 0.05) (tstamp 9eb286c9-8aca-4c6c-ab09-98847a0da5e4))
+  (fp_line (start -11.5 4) (end -11.5 8.5) (layer "F.CrtYd") (width 0.05) (tstamp a37851a5-313d-48d5-af4b-330b7cedbe44))
+  (fp_line (start 11.5 -4) (end 14.7 -4) (layer "F.CrtYd") (width 0.05) (tstamp a4447dca-583f-446c-aefd-a8c9fb5a541d))
+  (fp_line (start -14.7 2.3) (end -16.45 2.3) (layer "F.CrtYd") (width 0.05) (tstamp a4b3c722-e0e7-42d1-a59d-93da384ad921))
+  (fp_line (start 11.5 -8.5) (end 11.5 -4) (layer "F.CrtYd") (width 0.05) (tstamp a96aa54c-4d32-4e19-8cf4-82099975a35c))
+  (fp_line (start -14.7 -2.3) (end -14.7 -4) (layer "F.CrtYd") (width 0.05) (tstamp bd7aa3c2-e96d-4fc6-9bb8-43f2f594b4f7))
+  (fp_line (start -14.7 4) (end -14.7 2.3) (layer "F.CrtYd") (width 0.05) (tstamp c95f6722-bec3-4a01-b767-48945bd55ea1))
+  (fp_line (start -6.5 8.5) (end -11.5 8.5) (layer "F.CrtYd") (width 0.05) (tstamp d4a49e4e-cdcb-4268-a841-fb07071e9bad))
+  (fp_line (start 14.7 4) (end 11.5 4) (layer "F.CrtYd") (width 0.05) (tstamp e9658d38-53d2-4db7-bd53-49c51a4fd6f5))
+  (fp_line (start 11.5 4) (end 11.5 8.5) (layer "F.CrtYd") (width 0.05) (tstamp ede2d269-d246-4450-8cdb-e7e8b24d201a))
+  (fp_line (start 16.45 2.3) (end 14.7 2.3) (layer "F.CrtYd") (width 0.05) (tstamp f523010a-49fc-4d7b-a860-8243fd87a83b))
+  (fp_line (start -14.7 -2.3) (end -16.45 -2.3) (layer "F.CrtYd") (width 0.05) (tstamp f8ae9982-3018-417e-9226-a2edcb1ae055))
+  (fp_line (start -16.45 2.3) (end -16.45 -2.3) (layer "F.CrtYd") (width 0.05) (tstamp ff0ad6a4-674a-44b4-bb51-6d3643e6b67d))
+  (fp_arc (start -6.499999 -8.5) (mid 0 -10.700467) (end 6.5 -8.5) (layer "F.CrtYd") (width 0.05) (tstamp 1082ee05-9186-4b4b-afcc-206c5068416d))
+  (fp_arc (start 6.499999 8.5) (mid 0 10.700467) (end -6.5 8.5) (layer "F.CrtYd") (width 0.05) (tstamp 19274752-dfaf-4d53-ab5a-d0046d9d84cb))
+  (fp_line (start -11 6.4) (end -11 3.5) (layer "F.Fab") (width 0.1) (tstamp 2ceb8973-ebcf-4e6c-b782-399266f01827))
+  (fp_line (start -14.2 3.5) (end -14.2 -3.5) (layer "F.Fab") (width 0.1) (tstamp 3fb2fa35-5ad9-4fa4-b4ed-685271f4bfd6))
+  (fp_line (start 11 8) (end 11 3.5) (layer "F.Fab") (width 0.1) (tstamp 415aa1cf-929a-444a-9609-f8405ea94388))
+  (fp_line (start 14.2 -3.5) (end 11 -3.5) (layer "F.Fab") (width 0.1) (tstamp 45774119-2321-4812-a963-26853a990097))
+  (fp_line (start -9.4 8) (end -11 6.4) (layer "F.Fab") (width 0.1) (tstamp a3084b61-7a2f-46e8-aed4-25a753b1214f))
+  (fp_line (start 11 -8) (end -11 -8) (layer "F.Fab") (width 0.1) (tstamp a48f96a4-3fbd-470c-9416-894f0cb9ccb4))
+  (fp_line (start -11 3.5) (end -14.2 3.5) (layer "F.Fab") (width 0.1) (tstamp d30c1a46-e920-477d-bcdc-82fad3dc7ef4))
+  (fp_line (start 11 -8) (end 11 -3.5) (layer "F.Fab") (width 0.1) (tstamp d8a7263b-bd91-43ac-a958-4d8d3062e817))
+  (fp_line (start 11 3.5) (end 14.2 3.5) (layer "F.Fab") (width 0.1) (tstamp db2bbe7f-7706-49a5-83a4-84606db9f383))
+  (fp_line (start -11 -8) (end -11 -3.5) (layer "F.Fab") (width 0.1) (tstamp e386fe3f-da08-440e-a945-b629cd0c6f50))
+  (fp_line (start -14.2 -3.5) (end -11 -3.5) (layer "F.Fab") (width 0.1) (tstamp eb6b3d45-b56d-46a6-b817-5734bc5baa8d))
+  (fp_line (start 14.2 3.5) (end 14.2 -3.5) (layer "F.Fab") (width 0.1) (tstamp f0455d1f-c1d8-4003-a8d4-929909f9d4a0))
+  (fp_line (start 11 8) (end -9.4 8) (layer "F.Fab") (width 0.1) (tstamp fba03c28-234a-4852-a0ac-c5bdd0975bd9))
+  (pad "1" smd rect (at -14.65 0 180) (size 2.6 3.6) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1571e2ed-fcd5-40b6-9d2a-092df1a13509))
+  (pad "2" smd rect (at 14.65 0 180) (size 2.6 3.6) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 36eb9a8b-59c4-4efa-9800-b18b09afd892))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_1060_1x2032.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_106_1x20mm.kicad_mod

@@ -1,61 +1,68 @@
-(module BatteryHolder_Keystone_106_1x20mm (layer F.Cu) (tedit 5787C377)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=720)
+(footprint "BatteryHolder_Keystone_106_1x20mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5787C377)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=720")
   (tags "Keystone type 106 battery holder")
-  (fp_text reference REF** (at -1.25 -4.5) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -1.25 -4.5) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp dcbdbfc4-bd9b-46bc-8ae5-feef2d490977)
   )
-  (fp_text value BatteryHolder_Keystone_106_1x20mm (at 15 15) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_106_1x20mm" (at 15 15) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp d223f283-1914-4fc3-9903-e2673cb5e010)
   )
-  (fp_text user + (at 2.75 0) (layer F.SilkS)
+  (fp_text user "+" (at 2.75 0) (layer "F.SilkS")
     (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp f4fb15a4-5166-4769-a7fb-aef2bb5a93fb)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2be2c4d6-8cda-42b1-8619-82b8e3a542da)
   )
-  (fp_arc (start 15.2 0) (end 1.65 3.52) (angle -165.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 1.8 3.5) (angle -165.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 1.65 -3.52) (angle 165.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 1.8 -3.5) (angle 165.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 3.8) (end 0.95 3.05) (angle 70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0.95 3.8) (end 0.95 2.9) (angle 70) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -3.05) (angle -70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -2.9) (angle -70) (layer F.Fab) (width 0.10))
-  (fp_line (start 0.95 -3.05) (end -1.5 -3.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.5 3.05) (end 0.95 3.05) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -1.5 -2.5) (end -2.05 -2.5) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -1.5 2.5) (end -2.05 2.5) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.05 -2.5) (end -2.05 2.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.95 -2.9) (end -1.5 -2.9) (layer F.Fab) (width 0.10))
-  (fp_line (start -1.5 2.9) (end 0.95 2.9) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 2.5) (end -1.9 2.5) (angle -90) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 -2.5) (end -2.3 -2.5) (angle 90) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.3 -2.5) (end -2.3 2.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0.95 3.8) (end 0.95 3.3) (angle 70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 1.41 3.6) (angle -165.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 1.41 -3.6) (angle 165.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 5.18 1.3) (angle -180) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 1.3) (angle -170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 1.3) (angle -150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 -1.3) (angle 150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 -1.3) (angle 170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 5.18 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0.95 -3.3) (end -1.5 -3.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.5 3.3) (end 0.95 3.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.9 -2.5) (end -1.9 2.5) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 1.3) (end 16.2 1.3) (layer F.Fab) (width 0.10))
-  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -3.3) (angle -70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 16.2 0) (end 16.2 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 -1.3) (end 0 1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 2.5) (end -2.3 2.5) (angle -90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -1.5 -2.5) (end -1.9 -2.5) (angle 90) (layer F.Fab) (width 0.10))
-  (fp_line (start 22.6441 6.858) (end 25.35 9.3734) (layer F.Fab) (width 0.10))
-  (fp_line (start 22.6568 -6.858) (end 25.3419 -9.4288) (layer F.Fab) (width 0.10))
-  (pad 2 thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_106_1x20mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -1.5 3.05) (end 0.95 3.05) (layer "F.SilkS") (width 0.12) (tstamp 13150cc8-18a4-4a90-a014-6360b1e9b197))
+  (fp_line (start 0.95 -3.05) (end -1.5 -3.05) (layer "F.SilkS") (width 0.12) (tstamp 9bb40e2f-2f26-4edc-b845-ae34f589c565))
+  (fp_line (start -2.05 -2.5) (end -2.05 2.5) (layer "F.SilkS") (width 0.12) (tstamp d0060ffb-4dbe-4e71-95f3-be222ed804e9))
+  (fp_arc (start -1.5 3.05) (mid -1.888909 2.888909) (end -2.05 2.5) (layer "F.SilkS") (width 0.12) (tstamp 15f8a366-d3b4-497d-bfe9-cf499cc29a5c))
+  (fp_arc (start 1.65 -3.52) (mid 16.981862 -13.885887) (end 29.199738 0.015231) (layer "F.SilkS") (width 0.12) (tstamp 618336a5-5de7-4a70-a867-74d9bdbcec18))
+  (fp_arc (start 1.654769 -3.543485) (mid 1.380182 -3.185636) (end 0.95 -3.05) (layer "F.SilkS") (width 0.12) (tstamp 81a9e87d-e366-4ae9-ad42-9c4b59bd9625))
+  (fp_arc (start 29.199738 -0.015231) (mid 16.981862 13.885887) (end 1.65 3.52) (layer "F.SilkS") (width 0.12) (tstamp da98bf65-26f6-427c-869d-0a4cbd0d65f5))
+  (fp_arc (start -2.05 -2.5) (mid -1.888909 -2.888909) (end -1.5 -3.05) (layer "F.SilkS") (width 0.12) (tstamp e3242efb-31d0-4238-8ac7-ff94dfe4114a))
+  (fp_arc (start 0.95 3.05) (mid 1.380182 3.185636) (end 1.654769 3.543485) (layer "F.SilkS") (width 0.12) (tstamp f488d2cd-ab73-4142-a626-475faf9929d2))
+  (fp_line (start -2.3 -2.5) (end -2.3 2.5) (layer "F.CrtYd") (width 0.05) (tstamp 1668e02f-56f9-4644-bb7f-f2b453c55e43))
+  (fp_line (start -1.5 3.3) (end 0.95 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 6637b4cc-dc3a-4e7f-a3fb-2eb615fa0fdf))
+  (fp_line (start 0.95 -3.3) (end -1.5 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp a25f07ea-7f78-49b8-b647-fd4dba57be22))
+  (fp_arc (start -1.5 3.3) (mid -2.065685 3.065685) (end -2.3 2.5) (layer "F.CrtYd") (width 0.05) (tstamp 08451610-b038-48bf-ba93-42a05dd0917c))
+  (fp_arc (start 1.41 -3.6) (mid 17.030934 -14.134065) (end 29.452124 0.032591) (layer "F.CrtYd") (width 0.05) (tstamp 234dbc0b-9e0e-4a63-9188-168b6470b6ae))
+  (fp_arc (start -2.3 -2.5) (mid -2.065685 -3.065685) (end -1.5 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 4eeb53b3-574c-4bad-8b96-903f0f6ff830))
+  (fp_arc (start 29.452124 -0.032591) (mid 17.030934 14.134065) (end 1.41 3.6) (layer "F.CrtYd") (width 0.05) (tstamp 59fa14b6-c12c-49f5-86f6-af861d6b362a))
+  (fp_arc (start 1.419846 -3.62899) (mid 1.236788 -3.390424) (end 0.95 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp b79bfe90-f2e0-48a5-8164-7cf9174305bb))
+  (fp_arc (start 0.95 3.3) (mid 1.236788 3.390424) (end 1.419846 3.62899) (layer "F.CrtYd") (width 0.05) (tstamp efb2fc18-754a-4ae8-8390-ab23979c8507))
+  (fp_line (start -1.5 2.9) (end 0.95 2.9) (layer "F.Fab") (width 0.1) (tstamp 29d620bc-e3e1-49d7-8942-fb0cf3171edd))
+  (fp_line (start 0 -1.3) (end 0 1.3) (layer "F.Fab") (width 0.1) (tstamp 41387278-26f2-4a4b-9b1d-fc1a2d975aaa))
+  (fp_line (start 22.6441 6.858) (end 25.35 9.3734) (layer "F.Fab") (width 0.1) (tstamp 612c3657-658c-4924-98da-61e8d89bc377))
+  (fp_line (start 22.6568 -6.858) (end 25.3419 -9.4288) (layer "F.Fab") (width 0.1) (tstamp 75acb23b-79a3-4d07-a42b-be3f8a9909ff))
+  (fp_line (start 0.95 -2.9) (end -1.5 -2.9) (layer "F.Fab") (width 0.1) (tstamp 99cb90f4-2798-499a-ab7d-934ba9cb08a7))
+  (fp_line (start 0 1.3) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp bf764b56-bda3-426c-8e1e-a41fac6d560e))
+  (fp_line (start -1.9 -2.5) (end -1.9 2.5) (layer "F.Fab") (width 0.1) (tstamp c099b5d9-4ab6-4a19-b4ef-b0cebfc6872f))
+  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer "F.Fab") (width 0.1) (tstamp fe05572b-0a7c-425b-b351-8df7963f4abb))
+  (fp_arc (start 1.795723 -3.492182) (mid 1.466219 -3.062763) (end 0.95 -2.9) (layer "F.Fab") (width 0.1) (tstamp 03003322-3823-47fb-ab75-eeca7a060a23))
+  (fp_arc (start -1.9 -2.5) (mid -1.782843 -2.782843) (end -1.5 -2.9) (layer "F.Fab") (width 0.1) (tstamp 0d7b909b-75d9-42a5-9740-b79820e8685f))
+  (fp_arc (start 13.3 -1.3) (mid 15.963947 -2.171724) (end 17.495448 0.175833) (layer "F.Fab") (width 0.1) (tstamp 65777868-1a12-46c3-8de1-6808bf8b9d71))
+  (fp_arc (start 25.22 -1.3) (mid 16.5 10.02) (end 5.18 1.3) (layer "F.Fab") (width 0.1) (tstamp 7bb0e89e-737d-4e14-b5ef-e6029729472d))
+  (fp_arc (start -1.5 2.9) (mid -1.782843 2.782843) (end -1.9 2.5) (layer "F.Fab") (width 0.1) (tstamp 938196b9-ea74-4634-813c-c11edd66b9c3))
+  (fp_arc (start 9 -1.3) (mid 15.954687 -6.28971) (end 21.531551 0.203631) (layer "F.Fab") (width 0.1) (tstamp a84e5e91-43dc-4487-9fc2-fa7dd2c84424))
+  (fp_arc (start 5.18 -1.3) (mid 16.5 -10.02) (end 25.22 1.3) (layer "F.Fab") (width 0.1) (tstamp cf541c1a-f138-4bcd-9340-dce1752f5177))
+  (fp_arc (start 17.495448 -0.175833) (mid 15.963947 2.171724) (end 13.3 1.3) (layer "F.Fab") (width 0.1) (tstamp d4dc9155-3dfd-42a0-8ca1-40eb126f0864))
+  (fp_arc (start 0.95 2.9) (mid 1.466219 3.062763) (end 1.795723 3.492182) (layer "F.Fab") (width 0.1) (tstamp e3c39243-a1ad-41a5-9ab2-0bfbf7ae7b95))
+  (fp_arc (start 1.8 -3.5) (mid 16.980951 -13.734563) (end 29.049508 0.033425) (layer "F.Fab") (width 0.1) (tstamp f4abe101-d17c-4dcc-80ee-e1c41c2355a4))
+  (fp_arc (start 21.531551 -0.203631) (mid 15.954687 6.28971) (end 9 1.3) (layer "F.Fab") (width 0.1) (tstamp f56963bc-ce05-45e8-a335-52082fed2ca5))
+  (fp_arc (start 16.2 -1.3) (mid 17.5 0) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp f9b58cae-04a2-4431-89ae-934cd84a9fff))
+  (fp_arc (start 29.049508 -0.033425) (mid 16.980951 13.734562) (end 1.8 3.5) (layer "F.Fab") (width 0.1) (tstamp fe77ef56-0245-44a5-a9a0-b3067bcc801c))
+  (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp 82c535a1-531e-46a4-98e4-38379a4a2662))
+  (pad "2" thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp a029179a-de0a-459f-b325-fbfe6680b2ab))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_106_1x20mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_107_1x23mm.kicad_mod

@@ -1,61 +1,68 @@
-(module BatteryHolder_Keystone_107_1x23mm (layer F.Cu) (tedit 5787C387)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=746)
+(footprint "BatteryHolder_Keystone_107_1x23mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5787C387)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=746")
   (tags "Keystone type 107 battery holder")
-  (fp_text reference REF** (at -1.25 -4.5) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -1.25 -4.5) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2facc8ac-a406-4489-9786-1d81d421392e)
   )
-  (fp_text value BatteryHolder_Keystone_107_1x23mm (at 15 15) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_107_1x23mm" (at 15 15) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp a02270c0-a5d2-496a-b762-53283b72454a)
   )
-  (fp_text user + (at 2.75 0) (layer F.SilkS)
+  (fp_text user "+" (at 2.75 0) (layer "F.SilkS")
     (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 377c9c19-1823-4169-b296-011f56ead1b4)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp b376cc4d-1639-46cf-ae17-48a81db16859)
   )
-  (fp_arc (start 15.2 0) (end 1.65 3.52) (angle -165.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 1.8 3.5) (angle -165.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 1.65 -3.52) (angle 165.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 15.2 0) (end 1.8 -3.5) (angle 165.5) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 3.8) (end 0.95 3.05) (angle 70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0.95 3.8) (end 0.95 2.9) (angle 70) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -3.05) (angle -70) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -2.9) (angle -70) (layer F.Fab) (width 0.10))
-  (fp_line (start 0.95 -3.05) (end -1.5 -3.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.5 3.05) (end 0.95 3.05) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -1.5 -2.5) (end -2.05 -2.5) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -1.5 2.5) (end -2.05 2.5) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.05 -2.5) (end -2.05 2.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 0.95 -2.9) (end -1.5 -2.9) (layer F.Fab) (width 0.10))
-  (fp_line (start -1.5 2.9) (end 0.95 2.9) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 2.5) (end -1.9 2.5) (angle -90) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 -2.5) (end -2.3 -2.5) (angle 90) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.3 -2.5) (end -2.3 2.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0.95 3.8) (end 0.95 3.3) (angle 70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 1.41 3.6) (angle -165.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 1.41 -3.6) (angle 165.5) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 15.2 0) (end 3.7 1.3) (angle -180) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 1.3) (angle -170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 1.3) (angle -150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 13.3 -1.3) (angle 150) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 9 -1.3) (angle 170) (layer F.Fab) (width 0.10))
-  (fp_arc (start 15.2 0) (end 3.7 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0.95 -3.3) (end -1.5 -3.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.5 3.3) (end 0.95 3.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.9 -2.5) (end -1.9 2.5) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 1.3) (end 16.2 1.3) (layer F.Fab) (width 0.10))
-  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0.95 -3.8) (end 0.95 -3.3) (angle -70) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 16.2 0) (end 16.2 -1.3) (angle 180) (layer F.Fab) (width 0.10))
-  (fp_line (start 0 -1.3) (end 0 1.3) (layer F.Fab) (width 0.10))
-  (fp_arc (start -1.5 2.5) (end -2.3 2.5) (angle -90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -1.5 -2.5) (end -1.9 -2.5) (angle 90) (layer F.Fab) (width 0.10))
-  (fp_line (start 23.7236 7.8613) (end 25.3673 9.3907) (layer F.Fab) (width 0.10))
-  (fp_line (start 23.7109 -7.8867) (end 25.3392 -9.4388) (layer F.Fab) (width 0.10))
-  (pad 2 thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_107_1x23mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -2.05 -2.5) (end -2.05 2.5) (layer "F.SilkS") (width 0.12) (tstamp 1ca6a002-8016-4726-b632-b017b88515b3))
+  (fp_line (start 0.95 -3.05) (end -1.5 -3.05) (layer "F.SilkS") (width 0.12) (tstamp 7c50dff7-a57a-4f1c-914c-265bff46357f))
+  (fp_line (start -1.5 3.05) (end 0.95 3.05) (layer "F.SilkS") (width 0.12) (tstamp 99207621-e4ae-4457-86eb-227d30527314))
+  (fp_arc (start 0.95 3.05) (mid 1.380182 3.185636) (end 1.654769 3.543485) (layer "F.SilkS") (width 0.12) (tstamp 1b17e363-6ccc-45a5-b609-ded398ca55b5))
+  (fp_arc (start 1.654769 -3.543485) (mid 1.380182 -3.185636) (end 0.95 -3.05) (layer "F.SilkS") (width 0.12) (tstamp 919404fb-fc83-48e1-b962-337e2532d102))
+  (fp_arc (start 1.65 -3.52) (mid 16.981862 -13.885887) (end 29.199738 0.015231) (layer "F.SilkS") (width 0.12) (tstamp a101e22a-9065-4563-b4c3-1e164616cf66))
+  (fp_arc (start -2.05 -2.5) (mid -1.888909 -2.888909) (end -1.5 -3.05) (layer "F.SilkS") (width 0.12) (tstamp d7a9942b-dd0c-43c2-90b1-428a8a6781a2))
+  (fp_arc (start 29.199738 -0.015231) (mid 16.981862 13.885887) (end 1.65 3.52) (layer "F.SilkS") (width 0.12) (tstamp e26b2c2c-0149-4e16-96c4-2fb4df2a2ec6))
+  (fp_arc (start -1.5 3.05) (mid -1.888909 2.888909) (end -2.05 2.5) (layer "F.SilkS") (width 0.12) (tstamp ef0bacea-aa2a-4bcc-84df-d8eca8f2a562))
+  (fp_line (start 0.95 -3.3) (end -1.5 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp 3d23c3d7-4961-4b49-9125-c4321ae6093e))
+  (fp_line (start -2.3 -2.5) (end -2.3 2.5) (layer "F.CrtYd") (width 0.05) (tstamp 633eb474-a29e-4dcc-9cb7-9b2a0f3e73a5))
+  (fp_line (start -1.5 3.3) (end 0.95 3.3) (layer "F.CrtYd") (width 0.05) (tstamp 9db8441e-286b-4952-82a1-b8d5813f18e0))
+  (fp_arc (start -1.5 3.3) (mid -2.065685 3.065685) (end -2.3 2.5) (layer "F.CrtYd") (width 0.05) (tstamp 0bbb2c9d-d84e-4d4b-80e4-ac870256d0e3))
+  (fp_arc (start 0.95 3.3) (mid 1.236788 3.390424) (end 1.419846 3.62899) (layer "F.CrtYd") (width 0.05) (tstamp 7c05c494-4fbb-4965-9bcd-692a166c0d12))
+  (fp_arc (start 1.41 -3.6) (mid 17.030934 -14.134065) (end 29.452124 0.032591) (layer "F.CrtYd") (width 0.05) (tstamp 873c743b-8b34-40f7-b0f6-05c5269190d2))
+  (fp_arc (start 29.452124 -0.032591) (mid 17.030934 14.134065) (end 1.41 3.6) (layer "F.CrtYd") (width 0.05) (tstamp a9cfbe17-ab0d-4c47-96bf-1785013ff6c0))
+  (fp_arc (start -2.3 -2.5) (mid -2.065685 -3.065685) (end -1.5 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp f0f4b69a-dbd2-445f-94bd-89b668fbd2dc))
+  (fp_arc (start 1.419846 -3.62899) (mid 1.236788 -3.390424) (end 0.95 -3.3) (layer "F.CrtYd") (width 0.05) (tstamp f69405cd-c88a-4690-9227-d33a31754236))
+  (fp_line (start -1.9 -2.5) (end -1.9 2.5) (layer "F.Fab") (width 0.1) (tstamp 0e9cde26-a3fb-4641-9dc4-b08335d57bcf))
+  (fp_line (start 0 -1.3) (end 0 1.3) (layer "F.Fab") (width 0.1) (tstamp 29d7046a-bf5c-43b9-9dda-39292f49fb14))
+  (fp_line (start 0 1.3) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 53b39c6d-5557-4fe1-b5a5-2edc90d2c482))
+  (fp_line (start 23.7236 7.8613) (end 25.3673 9.3907) (layer "F.Fab") (width 0.1) (tstamp 74d801a8-1201-4c23-bb2e-5f5f99e5a173))
+  (fp_line (start 23.7109 -7.8867) (end 25.3392 -9.4388) (layer "F.Fab") (width 0.1) (tstamp a207ceda-580a-40db-9a96-5c136c5bfbf4))
+  (fp_line (start 0.95 -2.9) (end -1.5 -2.9) (layer "F.Fab") (width 0.1) (tstamp dd7c278d-465c-437e-94c1-e3ef27ec1e32))
+  (fp_line (start -1.5 2.9) (end 0.95 2.9) (layer "F.Fab") (width 0.1) (tstamp f2f7b85f-70c2-4bf3-b39d-67856336a8f1))
+  (fp_line (start 16.2 -1.3) (end 0 -1.3) (layer "F.Fab") (width 0.1) (tstamp fc8e653a-fecc-477b-ad01-62d651d4bd13))
+  (fp_arc (start -1.5 2.9) (mid -1.782843 2.782843) (end -1.9 2.5) (layer "F.Fab") (width 0.1) (tstamp 099779e2-8713-4336-9c57-4a0b57b0ff26))
+  (fp_arc (start 3.7 -1.3) (mid 16.5 -11.5) (end 26.7 1.3) (layer "F.Fab") (width 0.1) (tstamp 21bbf174-2540-4a3f-a05b-948bc8ecb6b8))
+  (fp_arc (start 29.049508 -0.033425) (mid 16.980951 13.734562) (end 1.8 3.5) (layer "F.Fab") (width 0.1) (tstamp 2ab8ecf7-38eb-4059-8fdc-8c00db0add1f))
+  (fp_arc (start 17.495448 -0.175833) (mid 15.963947 2.171724) (end 13.3 1.3) (layer "F.Fab") (width 0.1) (tstamp 3891541c-e2b3-49ed-a594-b59044f98baa))
+  (fp_arc (start 9 -1.3) (mid 15.954687 -6.28971) (end 21.531551 0.203631) (layer "F.Fab") (width 0.1) (tstamp 3c5f2645-760c-4df5-a9a2-4e686ea9dcde))
+  (fp_arc (start 1.795723 -3.492182) (mid 1.466219 -3.062763) (end 0.95 -2.9) (layer "F.Fab") (width 0.1) (tstamp 40796b6f-9026-4170-832f-b3eb935fe461))
+  (fp_arc (start 1.8 -3.5) (mid 16.980951 -13.734563) (end 29.049508 0.033425) (layer "F.Fab") (width 0.1) (tstamp 4ef99fd4-e79d-4e81-937c-d8729725d30b))
+  (fp_arc (start 13.3 -1.3) (mid 15.963947 -2.171724) (end 17.495448 0.175833) (layer "F.Fab") (width 0.1) (tstamp 5349ffdc-05fb-4c64-90fc-3e59f470da38))
+  (fp_arc (start 16.2 -1.3) (mid 17.5 0) (end 16.2 1.3) (layer "F.Fab") (width 0.1) (tstamp 7d7179bf-5940-4995-b18a-007b1231f930))
+  (fp_arc (start -1.9 -2.5) (mid -1.782843 -2.782843) (end -1.5 -2.9) (layer "F.Fab") (width 0.1) (tstamp 81d1f6af-312a-48e1-b114-b5adcf26d20d))
+  (fp_arc (start 0.95 2.9) (mid 1.466219 3.062763) (end 1.795723 3.492182) (layer "F.Fab") (width 0.1) (tstamp adaaea85-9e9f-4e66-9773-4aa02db121c0))
+  (fp_arc (start 21.531551 -0.203631) (mid 15.954687 6.28971) (end 9 1.3) (layer "F.Fab") (width 0.1) (tstamp c1a9c743-8163-4357-909a-d13d302a161c))
+  (fp_arc (start 26.7 -1.3) (mid 16.5 11.5) (end 3.7 1.3) (layer "F.Fab") (width 0.1) (tstamp f9439666-11b7-4582-9f11-04b51cacb68f))
+  (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp 02938728-dc09-4fcf-8839-2cd9ec3e10a8))
+  (pad "2" thru_hole circle (at 20.49 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (tstamp 35d3471c-9c75-4c7b-b17b-f5cc94be552a))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_107_1x23mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_2460_1xAA.kicad_mod

@@ -1,55 +1,63 @@
-(module BatteryHolder_Keystone_2460_1xAA (layer F.Cu) (tedit 5DBEA3CC)
-  (descr https://www.keyelco.com/product-pdf.cfm?p=1025)
+(footprint "BatteryHolder_Keystone_2460_1xAA" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5DBEA3CC)
+  (descr "https://www.keyelco.com/product-pdf.cfm?p=1025")
   (tags "AA battery cell holder")
-  (fp_text reference REF** (at -0.02 -9.42 180) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -0.02 -9.42 180) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2eb2e81e-441e-452d-b7c7-0aa71357ecdd)
   )
-  (fp_text value BatteryHolder_Keystone_2460_1xAA (at 24.5 0 180) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_2460_1xAA" (at 24.5 0 180) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 73286dcb-1a45-4062-a575-80a1c808b41f)
   )
-  (fp_line (start 33.9 5.6) (end 18.1 5.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 18.1 -5.6) (end 33.9 -5.6) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 18.1 -7.6) (end 16.1 -7.6) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 33.9 -7.6) (end 33.9 -5.6) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 33.9 7.6) (end 35.9 7.6) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 18.1 7.6) (end 18.1 5.6) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_line (start 35.9 7.6) (end 53.9 7.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 35.9 -7.6) (end 53.9 -7.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.9 -7.6) (end 16.1 -7.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 53.9 -7.6) (end 53.9 7.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.9 7.6) (end 16.1 7.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.9 -7.6) (end -1.9 7.6) (layer F.SilkS) (width 0.12))
-  (fp_text user %R (at 0.01 -0.06) (layer F.Fab)
+  (fp_text user "+" (at -3.4 -0.06) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1a09ffa6-50de-4348-b744-6050c44443f8)
   )
-  (fp_line (start -2.62 -8.565) (end 54.62 -8.565) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.62 8.565) (end -2.62 -8.565) (layer F.SilkS) (width 0.12))
-  (fp_line (start 54.62 8.565) (end -2.62 8.565) (layer F.SilkS) (width 0.12))
-  (fp_line (start 54.62 -8.565) (end 54.62 8.565) (layer F.SilkS) (width 0.12))
-  (fp_line (start 47.31 -1.06) (end 47.31 0.94) (layer F.SilkS) (width 0.12))
-  (fp_line (start 50.31 -4.06) (end 50.31 3.94) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.31 2.94) (end 49.31 -3.06) (layer F.SilkS) (width 0.12))
-  (fp_line (start 48.31 -2.06) (end 48.31 1.94) (layer F.SilkS) (width 0.12))
-  (fp_text user - (at 55.37 -0.06) (layer F.SilkS)
+  (fp_text user "-" (at 55.37 -0.06) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 76ebda3c-1f07-4434-8164-a4f279c9eea9)
   )
-  (fp_text user + (at -3.4 -0.06) (layer F.SilkS)
+  (fp_text user "${REFERENCE}" (at 0.01 -0.06) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp eb9a1334-3137-4aa5-98b5-cb4f15fd7e64)
   )
-  (fp_line (start 54.75 8.7) (end -2.75 8.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 54.75 -8.7) (end 54.75 8.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.75 -8.7) (end 54.75 -8.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.75 8.7) (end -2.75 -8.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 54.5 -8.445) (end -2.5 -8.445) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.5 -8.445) (end -2.5 8.445) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.5 8.445) (end 54.5 8.445) (layer F.Fab) (width 0.1))
-  (fp_line (start 54.5 8.445) (end 54.5 -8.445) (layer F.Fab) (width 0.1))
-  (pad "" np_thru_hole circle (at 2.75 -5.995 90) (size 2.64 2.64) (drill 2.64) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 49.23 5.995) (size 2.64 2.64) (drill 2.64) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 51.99 0 180) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (pad 1 thru_hole rect (at 0 0 180) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2460_1xAA.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 33.9 5.6) (end 18.1 5.6) (layer "F.SilkS") (width 0.12) (tstamp 289d1eee-3173-4d7e-9d8e-73d4cbdecce4))
+  (fp_line (start 54.62 -8.565) (end 54.62 8.565) (layer "F.SilkS") (width 0.12) (tstamp 350ae272-4599-450b-9dd5-69354f11056f))
+  (fp_line (start 49.31 2.94) (end 49.31 -3.06) (layer "F.SilkS") (width 0.12) (tstamp 35b1041b-478f-4146-b267-464dba30c5ac))
+  (fp_line (start 35.9 7.6) (end 53.9 7.6) (layer "F.SilkS") (width 0.12) (tstamp 42aa5284-a208-4d9a-a658-c1bfe83f606f))
+  (fp_line (start 53.9 -7.6) (end 53.9 7.6) (layer "F.SilkS") (width 0.12) (tstamp 4a6ce308-94ca-4859-b59b-8b904a22d180))
+  (fp_line (start -1.9 7.6) (end 16.1 7.6) (layer "F.SilkS") (width 0.12) (tstamp 4ade296a-7d17-4fee-8d06-3e5e53b32553))
+  (fp_line (start -1.9 -7.6) (end -1.9 7.6) (layer "F.SilkS") (width 0.12) (tstamp 4fe0f53b-5d9e-4f33-b995-89de3c245feb))
+  (fp_line (start 48.31 -2.06) (end 48.31 1.94) (layer "F.SilkS") (width 0.12) (tstamp 5402d443-43d5-4803-b142-a715f2e775f4))
+  (fp_line (start 47.31 -1.06) (end 47.31 0.94) (layer "F.SilkS") (width 0.12) (tstamp 5ec7e920-39e2-4f0a-a193-d2debdd465a9))
+  (fp_line (start -2.62 -8.565) (end 54.62 -8.565) (layer "F.SilkS") (width 0.12) (tstamp 7cdcfad4-14a5-4395-92aa-b7b097029a40))
+  (fp_line (start -2.62 8.565) (end -2.62 -8.565) (layer "F.SilkS") (width 0.12) (tstamp 9ef2b4bc-3138-41a7-81f1-15823a3a1139))
+  (fp_line (start 35.9 -7.6) (end 53.9 -7.6) (layer "F.SilkS") (width 0.12) (tstamp a0b0861c-d20e-47da-8281-a3876bf0b5a2))
+  (fp_line (start 54.62 8.565) (end -2.62 8.565) (layer "F.SilkS") (width 0.12) (tstamp a2b49e83-1bbf-4b93-8554-04c514c3168d))
+  (fp_line (start 50.31 -4.06) (end 50.31 3.94) (layer "F.SilkS") (width 0.12) (tstamp ad27c348-9c97-4bbb-97fc-849dc655a67d))
+  (fp_line (start 18.1 -5.6) (end 33.9 -5.6) (layer "F.SilkS") (width 0.12) (tstamp c6e062c2-5ded-42a8-8623-5c0faa1f3ab2))
+  (fp_line (start -1.9 -7.6) (end 16.1 -7.6) (layer "F.SilkS") (width 0.12) (tstamp f72eaa5b-2392-4076-8c3c-b593dfa0c146))
+  (fp_arc (start 35.9 -7.6) (mid 35.314214 -6.185786) (end 33.9 -5.6) (layer "F.SilkS") (width 0.12) (tstamp 3191deb4-0d62-4e78-87ed-2f163da054a4))
+  (fp_arc (start 33.9 5.6) (mid 35.314214 6.185786) (end 35.9 7.6) (layer "F.SilkS") (width 0.12) (tstamp 37ddd7e6-a2f5-4cfc-afe0-9341dfdd81a2))
+  (fp_arc (start 16.1 7.6) (mid 16.685786 6.185786) (end 18.1 5.6) (layer "F.SilkS") (width 0.12) (tstamp 4439bc2e-2196-4c02-9467-8b81a296308c))
+  (fp_arc (start 18.1 -5.6) (mid 16.685786 -6.185786) (end 16.1 -7.6) (layer "F.SilkS") (width 0.12) (tstamp 6cd76135-b556-48ca-9f95-ba2aeb1d7050))
+  (fp_line (start 54.75 -8.7) (end 54.75 8.7) (layer "F.CrtYd") (width 0.05) (tstamp 1b03964d-0774-484a-9dd3-e3aa1c48cff7))
+  (fp_line (start -2.75 8.7) (end -2.75 -8.7) (layer "F.CrtYd") (width 0.05) (tstamp 76b08207-dfb5-4ce5-ad4c-700dcb57d79b))
+  (fp_line (start -2.75 -8.7) (end 54.75 -8.7) (layer "F.CrtYd") (width 0.05) (tstamp d737e605-d1f5-4dab-a8e8-5ad02ec613a5))
+  (fp_line (start 54.75 8.7) (end -2.75 8.7) (layer "F.CrtYd") (width 0.05) (tstamp f48ee5e3-736b-49ce-bb10-3ff371dc2c6a))
+  (fp_line (start 54.5 8.445) (end 54.5 -8.445) (layer "F.Fab") (width 0.1) (tstamp 204eb638-a902-4c3c-989a-870082cbe22d))
+  (fp_line (start -2.5 -8.445) (end -2.5 8.445) (layer "F.Fab") (width 0.1) (tstamp 54f9a7df-a5ba-47db-83a2-9e658d24de61))
+  (fp_line (start 54.5 -8.445) (end -2.5 -8.445) (layer "F.Fab") (width 0.1) (tstamp b7144d99-e8fc-4223-98c8-1b4ec3b8b135))
+  (fp_line (start -2.5 8.445) (end 54.5 8.445) (layer "F.Fab") (width 0.1) (tstamp e1634427-0299-4c46-9c3d-f3bad4e91d05))
+  (pad "" np_thru_hole circle (at 49.23 5.995) (size 2.64 2.64) (drill 2.64) (layers *.Cu *.Mask) (tstamp 8de0ca7a-f5ec-44c8-add9-7b92fecff59f))
+  (pad "" np_thru_hole circle (at 2.75 -5.995 90) (size 2.64 2.64) (drill 2.64) (layers *.Cu *.Mask) (tstamp e821f9df-096f-48cf-a775-2d72ebc38d50))
+  (pad "1" thru_hole rect (at 0 0 180) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp 286259a1-29f8-456a-b03c-48ace0a2c2db))
+  (pad "2" thru_hole circle (at 51.99 0 180) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp 1afe4efe-73f2-4a58-b3a9-79ca21d063ef))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2460_1xAA.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_2462_2xAA.kicad_mod

@@ -1,90 +1,102 @@
-(module BatteryHolder_Keystone_2462_2xAA (layer F.Cu) (tedit 5BB4D45D)
+(footprint "BatteryHolder_Keystone_2462_2xAA" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5BB4D45D)
   (descr "2xAA cell battery holder, Keystone P/N 2462, https://www.keyelco.com/product-pdf.cfm?p=1027")
   (tags "AA battery cell holder")
-  (fp_text reference REF** (at 0 -10.16 180) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -10.16 180) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 7eeb00cf-f500-4af8-991a-6b93abe3fd7c)
   )
-  (fp_text value BatteryHolder_Keystone_2462_2xAA (at 27.165 8.715) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_2462_2xAA" (at 27.165 8.715) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 16c8cd98-b33b-4ffb-b47b-df39d12da670)
   )
-  (fp_text user - (at 37.945 0) (layer F.SilkS)
+  (fp_text user "+" (at 16.355 0) (layer "F.SilkS")
     (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 0009cb17-019e-45e1-b7fd-7fa0c2a58b3b)
   )
-  (fp_text user + (at 16.355 0) (layer F.SilkS)
+  (fp_text user "+" (at -3.81 0) (layer "F.SilkS")
     (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 172059c3-f08e-4cac-8257-a148acf593c7)
   )
-  (fp_text user %R (at 0 -10.16) (layer F.Fab)
+  (fp_text user "+" (at 37.945 14.99) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 633761ac-da64-475a-a015-a8e30196ba47)
+  )
+  (fp_text user "-" (at -3.81 14.99) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 9180d1f5-e19a-4af9-9e3a-56fa040c5aec)
+  )
+  (fp_text user "-" (at 37.945 0) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp ee3b5a7e-3b5d-4b04-83eb-8fef0aacc56b)
+  )
+  (fp_text user "-" (at 16.355 14.99) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp f3324a6d-dffa-404d-a0a8-66e2fc9af448)
+  )
+  (fp_text user "${REFERENCE}" (at 0 -10.16) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e8e8ab94-6cbb-441f-9898-ce98f26c0d35)
   )
-  (fp_text user + (at 37.945 14.99) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user - (at 16.355 14.99) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user + (at -3.81 0) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user - (at -3.81 14.99) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_line (start 57.17 24.21) (end 57.17 -9.22) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.84 24.21) (end 57.17 24.21) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.84 -9.22) (end -2.84 24.21) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 57.17 -9.22) (end -2.84 -9.22) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 57.02 24.055) (end 57.02 -9.065) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.69 24.055) (end 57.02 24.055) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.69 -9.065) (end -2.69 24.055) (layer F.SilkS) (width 0.12))
-  (fp_line (start 57.02 -9.065) (end -2.69 -9.065) (layer F.SilkS) (width 0.12))
-  (fp_line (start 17.625 17.53) (end 17.625 12.45) (layer F.SilkS) (width 0.12))
-  (fp_line (start 17.625 12.45) (end 35.405 12.45) (layer F.SilkS) (width 0.12))
-  (fp_line (start 35.405 12.45) (end 35.405 13.72) (layer F.SilkS) (width 0.12))
-  (fp_line (start 35.405 13.72) (end 36.675 13.72) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 13.72) (end 36.675 16.26) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 16.26) (end 35.405 16.26) (layer F.SilkS) (width 0.12))
-  (fp_line (start 35.405 16.26) (end 35.405 17.53) (layer F.SilkS) (width 0.12))
-  (fp_line (start 35.405 17.53) (end 17.625 17.53) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 -1.27) (end 36.675 2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 2.54) (end 18.895 2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 18.895 2.54) (end 18.895 1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 18.895 1.27) (end 17.625 1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 17.625 1.27) (end 17.625 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 17.625 -1.27) (end 18.895 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 18.895 -1.27) (end 18.895 -2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 18.895 -2.54) (end 36.675 -2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 -2.54) (end 36.675 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.42 7.241) (end 55.75 7.241) (layer F.SilkS) (width 0.12))
-  (fp_line (start 55.75 7.749) (end -1.42 7.749) (layer F.SilkS) (width 0.12))
-  (fp_line (start 17.625 20.245) (end 17.625 22.785) (layer F.SilkS) (width 0.12))
-  (fp_line (start 17.625 22.785) (end 36.675 22.785) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 22.785) (end 36.675 20.245) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.375 -5.255) (end 36.675 -5.255) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 -5.255) (end 36.675 -7.795) (layer F.SilkS) (width 0.12))
-  (fp_line (start 36.675 -7.795) (end 17.625 -7.795) (layer F.SilkS) (width 0.12))
-  (fp_line (start 17.625 -7.795) (end 17.625 -5.255) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.375 20.245) (end 36.675 20.245) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.925 -5.255) (end 17.625 -5.255) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.925 -5.255) (end 4.925 -7.795) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.925 -7.795) (end -1.42 -7.795) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.42 -7.795) (end -1.42 22.785) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.42 22.785) (end 4.925 22.785) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.925 22.785) (end 4.925 20.245) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.925 20.245) (end 17.625 20.245) (layer F.SilkS) (width 0.12))
-  (fp_line (start 55.75 -7.795) (end 49.375 -7.795) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.375 -7.795) (end 49.375 -5.255) (layer F.SilkS) (width 0.12))
-  (fp_line (start 55.75 -7.795) (end 55.75 22.785) (layer F.SilkS) (width 0.12))
-  (fp_line (start 55.75 22.785) (end 49.375 22.785) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.375 22.785) (end 49.375 20.245) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.59 23.955) (end -2.59 -8.965) (layer F.Fab) (width 0.1))
-  (fp_line (start 56.92 23.955) (end 56.92 -8.965) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.59 23.955) (end 56.92 23.955) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.59 -8.965) (end 56.92 -8.965) (layer F.Fab) (width 0.1))
-  (pad 1 thru_hole rect (at 0 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 14.99) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 27.165 14.99) (size 3.3 3.3) (drill 3.3) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 27.165 0) (size 3.3 3.3) (drill 3.3) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2462_2xAA.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 57.02 -9.065) (end -2.69 -9.065) (layer "F.SilkS") (width 0.12) (tstamp 00863c5f-3f83-4390-8353-edb0ff095ba7))
+  (fp_line (start 17.625 17.53) (end 17.625 12.45) (layer "F.SilkS") (width 0.12) (tstamp 0b70bfcb-480c-41ed-8108-458a4ade5137))
+  (fp_line (start 4.925 -5.255) (end 17.625 -5.255) (layer "F.SilkS") (width 0.12) (tstamp 100b2b5f-7036-430f-8e0c-5957dbb10978))
+  (fp_line (start 17.625 1.27) (end 17.625 -1.27) (layer "F.SilkS") (width 0.12) (tstamp 1aa9f4a5-31d9-4c93-b1f4-f5f992467190))
+  (fp_line (start 57.02 24.055) (end 57.02 -9.065) (layer "F.SilkS") (width 0.12) (tstamp 21f97c2e-7812-4313-a137-f7034826f687))
+  (fp_line (start -2.69 24.055) (end 57.02 24.055) (layer "F.SilkS") (width 0.12) (tstamp 23d9a863-03d0-4b46-b9a2-2372c9f384a9))
+  (fp_line (start 17.625 -7.795) (end 17.625 -5.255) (layer "F.SilkS") (width 0.12) (tstamp 23f4a5ac-8fea-4c85-80de-1e4a9b26c18e))
+  (fp_line (start 17.625 -1.27) (end 18.895 -1.27) (layer "F.SilkS") (width 0.12) (tstamp 2e1ce6e7-b190-4022-95fd-ad9bfad70d12))
+  (fp_line (start 4.925 22.785) (end 4.925 20.245) (layer "F.SilkS") (width 0.12) (tstamp 307aa6f1-c3c5-4b2c-b78f-a606d61aeadd))
+  (fp_line (start 36.675 22.785) (end 36.675 20.245) (layer "F.SilkS") (width 0.12) (tstamp 36aaad09-37f9-4f56-8c33-219761db277d))
+  (fp_line (start 49.375 -7.795) (end 49.375 -5.255) (layer "F.SilkS") (width 0.12) (tstamp 395958ff-7dde-47d3-9327-6973770b03e6))
+  (fp_line (start 36.675 -2.54) (end 36.675 -1.27) (layer "F.SilkS") (width 0.12) (tstamp 3c049a3c-a59b-47a9-a6f8-5fe53ead56dd))
+  (fp_line (start 36.675 2.54) (end 18.895 2.54) (layer "F.SilkS") (width 0.12) (tstamp 4d7412cb-404a-4c9b-bb03-fec74b7eee03))
+  (fp_line (start 18.895 -2.54) (end 36.675 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 4e2eeff9-b8bf-4398-8f0c-af8d8b7ed2f9))
+  (fp_line (start 35.405 16.26) (end 35.405 17.53) (layer "F.SilkS") (width 0.12) (tstamp 55cf6b1b-9c05-48e1-9d7b-c29b132cce68))
+  (fp_line (start 35.405 13.72) (end 36.675 13.72) (layer "F.SilkS") (width 0.12) (tstamp 57b4fd06-757a-4844-ac11-ae5f0e221f18))
+  (fp_line (start -2.69 -9.065) (end -2.69 24.055) (layer "F.SilkS") (width 0.12) (tstamp 57e121bf-3a1d-4064-9ee8-645594ac0641))
+  (fp_line (start 4.925 -5.255) (end 4.925 -7.795) (layer "F.SilkS") (width 0.12) (tstamp 59816955-e379-4bd5-a0fd-0c018a96425b))
+  (fp_line (start 18.895 -1.27) (end 18.895 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 5c07d491-7be7-4952-9f8c-938dc00771c6))
+  (fp_line (start 35.405 17.53) (end 17.625 17.53) (layer "F.SilkS") (width 0.12) (tstamp 61330815-3eda-42ca-a064-55010994818c))
+  (fp_line (start 4.925 20.245) (end 17.625 20.245) (layer "F.SilkS") (width 0.12) (tstamp 7175bb93-6ded-40a4-9113-77432b5321bb))
+  (fp_line (start 36.675 -1.27) (end 36.675 2.54) (layer "F.SilkS") (width 0.12) (tstamp 7592f4e7-8ea4-483f-82b4-626c778776f1))
+  (fp_line (start 18.895 1.27) (end 17.625 1.27) (layer "F.SilkS") (width 0.12) (tstamp 7886aece-9ef8-4ea3-bd06-71e5785efe4a))
+  (fp_line (start -1.42 7.241) (end 55.75 7.241) (layer "F.SilkS") (width 0.12) (tstamp 7a7603c8-d08d-4665-ba90-231c7ce46a6a))
+  (fp_line (start 55.75 7.749) (end -1.42 7.749) (layer "F.SilkS") (width 0.12) (tstamp 7b00ad6e-6004-4c8a-9c10-fcbc14acd5db))
+  (fp_line (start 17.625 22.785) (end 36.675 22.785) (layer "F.SilkS") (width 0.12) (tstamp 7dc6b1b5-c44e-489a-85af-5f3bb8d9af22))
+  (fp_line (start 17.625 20.245) (end 17.625 22.785) (layer "F.SilkS") (width 0.12) (tstamp 8889a4f0-0e95-4bf3-b43d-b28b0ae0e3b9))
+  (fp_line (start 36.675 -5.255) (end 36.675 -7.795) (layer "F.SilkS") (width 0.12) (tstamp 92b62ae5-7b87-43a9-b1d0-1213b408066d))
+  (fp_line (start 55.75 -7.795) (end 55.75 22.785) (layer "F.SilkS") (width 0.12) (tstamp 9ac8648f-6651-4764-8017-f1922f8ca9dc))
+  (fp_line (start 49.375 20.245) (end 36.675 20.245) (layer "F.SilkS") (width 0.12) (tstamp 9e10cee7-ef28-425b-9d9e-744fdf062e66))
+  (fp_line (start 36.675 -7.795) (end 17.625 -7.795) (layer "F.SilkS") (width 0.12) (tstamp a25842b5-e37e-4dfb-a030-045c09b7517a))
+  (fp_line (start -1.42 22.785) (end 4.925 22.785) (layer "F.SilkS") (width 0.12) (tstamp a4837245-cdc1-444b-b19a-e16b38f90ed2))
+  (fp_line (start 17.625 12.45) (end 35.405 12.45) (layer "F.SilkS") (width 0.12) (tstamp a4fbe8ab-76ae-4344-aba7-9d9446685459))
+  (fp_line (start 36.675 16.26) (end 35.405 16.26) (layer "F.SilkS") (width 0.12) (tstamp a587281c-d7b0-46a1-bf31-fc69427906a0))
+  (fp_line (start 35.405 12.45) (end 35.405 13.72) (layer "F.SilkS") (width 0.12) (tstamp a5a03cab-032b-4224-90ed-83a9adaf36d0))
+  (fp_line (start -1.42 -7.795) (end -1.42 22.785) (layer "F.SilkS") (width 0.12) (tstamp bb05b7c3-8575-474c-a321-15668f2553ed))
+  (fp_line (start 55.75 -7.795) (end 49.375 -7.795) (layer "F.SilkS") (width 0.12) (tstamp bb14b579-f1b2-47a1-87dd-8e21483360f2))
+  (fp_line (start 49.375 22.785) (end 49.375 20.245) (layer "F.SilkS") (width 0.12) (tstamp d1a704ee-aead-4279-9461-c7493cc58cc1))
+  (fp_line (start 18.895 2.54) (end 18.895 1.27) (layer "F.SilkS") (width 0.12) (tstamp d65b79f8-3bd6-4bbc-9664-741857489d7f))
+  (fp_line (start 55.75 22.785) (end 49.375 22.785) (layer "F.SilkS") (width 0.12) (tstamp d7172281-c2bc-442c-acba-d7017ee3c891))
+  (fp_line (start 4.925 -7.795) (end -1.42 -7.795) (layer "F.SilkS") (width 0.12) (tstamp dbc19bbd-e7dc-4472-8d47-e51f90ecad3c))
+  (fp_line (start 36.675 13.72) (end 36.675 16.26) (layer "F.SilkS") (width 0.12) (tstamp e37ce9df-e7ec-4039-bb91-5fdb91eea504))
+  (fp_line (start 49.375 -5.255) (end 36.675 -5.255) (layer "F.SilkS") (width 0.12) (tstamp fc7c7e9f-d474-4d1e-91c7-ddfc7e621563))
+  (fp_line (start -2.84 24.21) (end 57.17 24.21) (layer "F.CrtYd") (width 0.05) (tstamp 0f27dc41-16fb-465e-962a-6f91a0ee9832))
+  (fp_line (start 57.17 24.21) (end 57.17 -9.22) (layer "F.CrtYd") (width 0.05) (tstamp 7ade2638-ad54-4094-8b89-766090a80435))
+  (fp_line (start 57.17 -9.22) (end -2.84 -9.22) (layer "F.CrtYd") (width 0.05) (tstamp d83545a7-7e27-438c-9519-8e34f289d07f))
+  (fp_line (start -2.84 -9.22) (end -2.84 24.21) (layer "F.CrtYd") (width 0.05) (tstamp fc5757df-9189-46d9-a08f-4592f1f58068))
+  (fp_line (start 56.92 23.955) (end 56.92 -8.965) (layer "F.Fab") (width 0.1) (tstamp 313a0c93-a3fe-40f4-b17c-9c52f322f4a0))
+  (fp_line (start -2.59 23.955) (end -2.59 -8.965) (layer "F.Fab") (width 0.1) (tstamp 39507bd2-c72b-4ee3-bdc2-63d6ddf67d06))
+  (fp_line (start -2.59 -8.965) (end 56.92 -8.965) (layer "F.Fab") (width 0.1) (tstamp a6417ba1-6ad6-4e7e-81a8-24a4d9c9ec4e))
+  (fp_line (start -2.59 23.955) (end 56.92 23.955) (layer "F.Fab") (width 0.1) (tstamp c09c23a5-4c48-4cca-b703-4692286d7603))
+  (pad "" np_thru_hole circle (at 27.165 0) (size 3.3 3.3) (drill 3.3) (layers *.Cu *.Mask) (tstamp 41c09925-e065-42c1-9741-4430ce9762b5))
+  (pad "" np_thru_hole circle (at 27.165 14.99) (size 3.3 3.3) (drill 3.3) (layers *.Cu *.Mask) (tstamp 49ef0bf2-86c3-4d96-8426-3d0f7769c7de))
+  (pad "1" thru_hole rect (at 0 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp 44b2f5c5-cdf4-418c-a278-45882200ebf3))
+  (pad "2" thru_hole circle (at 0 14.99) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp 6a62d8ab-cbab-4999-8aeb-e888fa03f47d))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2462_2xAA.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_2466_1xAAA.kicad_mod

@@ -1,64 +1,72 @@
-(module BatteryHolder_Keystone_2466_1xAAA (layer F.Cu) (tedit 5B254C39)
+(footprint "BatteryHolder_Keystone_2466_1xAAA" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5B254C39)
   (descr "1xAAA Battery Holder, Keystone, Plastic Case, http://www.keyelco.com/product-pdf.cfm?p=1031")
   (tags "AAA battery holder Keystone")
-  (fp_text reference REF** (at 0 -8 180) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -8 180) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 5906348c-3d7e-4f17-9177-6b379b3deff0)
   )
-  (fp_text value BatteryHolder_Keystone_2466_1xAAA (at 22 0) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_2466_1xAAA" (at 22 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 251fc499-25d0-448f-b2d2-9ac501bd0690)
   )
-  (fp_text user - (at 48.26 0) (layer F.SilkS)
+  (fp_text user "+" (at -3.81 0) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 718fe782-3d59-4081-ab05-2b3f82d887cf)
   )
-  (fp_text user + (at -3.81 0) (layer F.SilkS)
+  (fp_text user "-" (at 48.26 0) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp f8ca4710-26c3-4e17-9109-ee300e2b08be)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 0d304952-af36-45a4-85db-b069f444bfbd)
   )
-  (fp_line (start 47.8 7) (end 47.8 -7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.2 7) (end 47.8 7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.2 -7) (end -3.2 7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 47.8 -7) (end -3.2 -7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 47.4 6.6) (end 47.4 -6.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.8 6.6) (end 47.4 6.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.8 -6.6) (end -2.8 6.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 47.4 -6.6) (end -2.8 -6.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 40 -1) (end 40 1) (layer F.SilkS) (width 0.12))
-  (fp_line (start 41 -2) (end 41 2) (layer F.SilkS) (width 0.12))
-  (fp_line (start 42 3) (end 42 -3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 43 -4) (end 43 4) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2 -2) (end -1 -2) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1 2) (end -2 2) (layer F.SilkS) (width 0.12))
-  (fp_line (start 15 6) (end 29 6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 29 -6) (end 15 -6) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 31 -6) (end 31 -4) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 13 -6) (end 15 -6) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 13 6) (end 13 4) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 31 6) (end 29 6) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3 4) (end 13 4) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3 -4) (end 13 -4) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 3 6) (end 1 6) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_line (start 41 -4) (end 31 -4) (layer F.SilkS) (width 0.12))
-  (fp_line (start 41 4) (end 31 4) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 41 6) (end 41 4) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 41 -6) (end 43 -6) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 3 -6) (end 3 -4) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2 -6) (end 1 -6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2 -6) (end -2 6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2 6) (end 1 6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 46 -6) (end 43 -6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 46 -6) (end 46 6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 46 6) (end 43 6) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.7 0) (end -2.7 -6.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.7 -6.5) (end 47.3 -6.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 47.3 -6.5) (end 47.3 6.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 47.3 6.5) (end -2.7 6.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.7 6.5) (end -2.7 0) (layer F.Fab) (width 0.1))
-  (pad 1 thru_hole rect (at 0 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 44.7 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2466_1xAAA.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 41 -2) (end 41 2) (layer "F.SilkS") (width 0.12) (tstamp 082b949c-1992-4a18-8e8a-53701b0edf2c))
+  (fp_line (start -2 6) (end 1 6) (layer "F.SilkS") (width 0.12) (tstamp 0fbbd1dc-9627-404a-9df5-92223e70f9f1))
+  (fp_line (start 47.4 6.6) (end 47.4 -6.6) (layer "F.SilkS") (width 0.12) (tstamp 120564a1-d059-4b50-8261-8754c16e89d3))
+  (fp_line (start 43 -4) (end 43 4) (layer "F.SilkS") (width 0.12) (tstamp 1e998afe-29ca-4042-9c9b-511d90ed4536))
+  (fp_line (start 3 4) (end 13 4) (layer "F.SilkS") (width 0.12) (tstamp 3a6ad050-8aff-482d-9e5e-b6aeb0afdb1b))
+  (fp_line (start 3 -4) (end 13 -4) (layer "F.SilkS") (width 0.12) (tstamp 517ed470-d02f-4a58-8264-7edca39bd5b8))
+  (fp_line (start -2.8 -6.6) (end -2.8 6.6) (layer "F.SilkS") (width 0.12) (tstamp 518af72a-65bf-4e3d-82e8-d45592784c2b))
+  (fp_line (start 15 6) (end 29 6) (layer "F.SilkS") (width 0.12) (tstamp 5731038d-3acc-45b4-90da-a92502eee124))
+  (fp_line (start -2 -2) (end -1 -2) (layer "F.SilkS") (width 0.12) (tstamp 5982c8be-1baf-491f-a0f0-b18907db6ad5))
+  (fp_line (start 29 -6) (end 15 -6) (layer "F.SilkS") (width 0.12) (tstamp 6b1280f4-24f7-4ba0-abb9-8509da505dc9))
+  (fp_line (start 47.4 -6.6) (end -2.8 -6.6) (layer "F.SilkS") (width 0.12) (tstamp 8daf917b-87fe-437e-8b96-535497e1f762))
+  (fp_line (start 40 -1) (end 40 1) (layer "F.SilkS") (width 0.12) (tstamp 8e6c75a0-fd46-4ee4-934a-1c08751662d4))
+  (fp_line (start 41 -4) (end 31 -4) (layer "F.SilkS") (width 0.12) (tstamp 9affa0db-2a18-4e2f-a5d7-597ce83e207b))
+  (fp_line (start 46 -6) (end 46 6) (layer "F.SilkS") (width 0.12) (tstamp a5734503-258e-4db6-a9b1-b576eeda67f2))
+  (fp_line (start -2 -6) (end -2 6) (layer "F.SilkS") (width 0.12) (tstamp b65e2b3c-8964-4a41-8ac3-e8d3839bae39))
+  (fp_line (start 41 4) (end 31 4) (layer "F.SilkS") (width 0.12) (tstamp ca23d1ad-faf3-4ae9-a7ee-0ebb9751fab1))
+  (fp_line (start 42 3) (end 42 -3) (layer "F.SilkS") (width 0.12) (tstamp d25100bd-0e89-4871-ad03-367ac19d8aea))
+  (fp_line (start 46 -6) (end 43 -6) (layer "F.SilkS") (width 0.12) (tstamp d6aceb30-5575-4469-aa2e-f10c2c1b69ce))
+  (fp_line (start 46 6) (end 43 6) (layer "F.SilkS") (width 0.12) (tstamp e9d48c22-f712-4dd8-9424-04dc0e10165e))
+  (fp_line (start -1 2) (end -2 2) (layer "F.SilkS") (width 0.12) (tstamp f62ad8ad-a6b8-4723-9624-7379cbf36cd5))
+  (fp_line (start -2.8 6.6) (end 47.4 6.6) (layer "F.SilkS") (width 0.12) (tstamp f847af2e-d61c-4e2b-a6a6-48b14db3d9ac))
+  (fp_line (start -2 -6) (end 1 -6) (layer "F.SilkS") (width 0.12) (tstamp fe35cb9f-2b94-415e-9a84-1b37b24413f0))
+  (fp_arc (start 13 4) (mid 14.414214 4.585786) (end 15 6) (layer "F.SilkS") (width 0.12) (tstamp 02f3e349-0244-4286-ab15-4c3dff2bacf7))
+  (fp_arc (start 3 -4) (mid 1.585786 -4.585786) (end 1 -6) (layer "F.SilkS") (width 0.12) (tstamp 0353ffd1-9c4a-40d1-86e7-192233f34a4a))
+  (fp_arc (start 15 -6) (mid 14.414214 -4.585786) (end 13 -4) (layer "F.SilkS") (width 0.12) (tstamp 082ed33c-d950-43cf-9edd-e48fbe101c52))
+  (fp_arc (start 43 -6) (mid 42.414214 -4.585786) (end 41 -4) (layer "F.SilkS") (width 0.12) (tstamp 1ed58381-0851-4991-a322-206123fa56cc))
+  (fp_arc (start 1 6) (mid 1.585786 4.585786) (end 3 4) (layer "F.SilkS") (width 0.12) (tstamp 217b9012-861c-4c08-bca1-c1bc09f1b299))
+  (fp_arc (start 41 4) (mid 42.414214 4.585786) (end 43 6) (layer "F.SilkS") (width 0.12) (tstamp 70f2a4d7-b754-444a-b31e-11ae0781d23f))
+  (fp_arc (start 31 -4) (mid 29.585786 -4.585786) (end 29 -6) (layer "F.SilkS") (width 0.12) (tstamp 9dd86a3c-4fc4-4888-9e0e-23d47776aa31))
+  (fp_arc (start 29 6) (mid 29.585786 4.585786) (end 31 4) (layer "F.SilkS") (width 0.12) (tstamp b7ba6f0d-23ef-4e4e-b7db-bd823a4b8384))
+  (fp_line (start -3.2 -7) (end -3.2 7) (layer "F.CrtYd") (width 0.05) (tstamp 8206c569-721f-4931-b3a9-af3d36be3788))
+  (fp_line (start -3.2 7) (end 47.8 7) (layer "F.CrtYd") (width 0.05) (tstamp 87888ec5-5d52-4a4c-9000-4d0738e917a6))
+  (fp_line (start 47.8 -7) (end -3.2 -7) (layer "F.CrtYd") (width 0.05) (tstamp d4e63a7b-ca02-4fb8-a580-f2d3644d6f08))
+  (fp_line (start 47.8 7) (end 47.8 -7) (layer "F.CrtYd") (width 0.05) (tstamp e5b5e7da-253b-43bb-8461-87d744dc2819))
+  (fp_line (start 47.3 -6.5) (end 47.3 6.5) (layer "F.Fab") (width 0.1) (tstamp 8f9fad46-5597-4be3-8c81-a26a37d18d44))
+  (fp_line (start -2.7 -6.5) (end 47.3 -6.5) (layer "F.Fab") (width 0.1) (tstamp 98ba2415-893e-4709-a60d-a474195ba608))
+  (fp_line (start -2.7 6.5) (end -2.7 0) (layer "F.Fab") (width 0.1) (tstamp a3faa380-8d95-4048-825a-559a033ca41f))
+  (fp_line (start 47.3 6.5) (end -2.7 6.5) (layer "F.Fab") (width 0.1) (tstamp a676f387-fa63-4e7f-b4fa-659409c3ab78))
+  (fp_line (start -2.7 0) (end -2.7 -6.5) (layer "F.Fab") (width 0.1) (tstamp e79138ca-4564-45b7-b899-d4cd4e7bab99))
+  (pad "1" thru_hole rect (at 0 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp 296997d5-f8a8-42b7-8daa-842979f75b06))
+  (pad "2" thru_hole circle (at 44.7 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp 169dd0a9-f3d5-4e60-8114-050dd8011caf))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2466_1xAAA.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_2468_2xAAA.kicad_mod

@@ -1,93 +1,105 @@
-(module BatteryHolder_Keystone_2468_2xAAA (layer F.Cu) (tedit 5C9A5FE6)
+(footprint "BatteryHolder_Keystone_2468_2xAAA" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5C9A5FE6)
   (descr "2xAAA cell battery holder, Keystone P/N 2468, http://www.keyelco.com/product-pdf.cfm?p=1033")
   (tags "AAA battery cell holder")
-  (fp_text reference REF** (at 0 -7) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -7) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2c1a0ebc-a8a9-4ac2-9bdd-3a284160ea48)
   )
-  (fp_text value BatteryHolder_Keystone_2468_2xAAA (at 23.9 7.35) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_2468_2xAAA" (at 23.9 7.35) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 26464c23-0125-4bd8-af19-2b630b086ff6)
   )
-  (fp_text user %R (at 23.9 5.35) (layer F.Fab)
+  (fp_text user "-" (at 12.7 12.7) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 18b3a0cb-0adc-4792-8665-3fc04088ff89)
+  )
+  (fp_text user "+" (at 35.1 12.7) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 4c507233-fde9-4518-917d-23896ba8216d)
+  )
+  (fp_text user "+" (at -3.81 0) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 5703b276-c5a8-41ea-abee-6837ecbea522)
+  )
+  (fp_text user "+" (at 12.7 0) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 7b435d19-aaf5-4322-a429-81d07b6dd8be)
+  )
+  (fp_text user "-" (at -3.81 12.7) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp 9699e779-49e6-44ec-a2ff-ecbff7c07e1d)
+  )
+  (fp_text user "-" (at 35.1 0) (layer "F.SilkS")
+    (effects (font (size 1.5 1.5) (thickness 0.15)))
+    (tstamp cb66ca43-dcc0-4011-a02d-d004bb47d14c)
+  )
+  (fp_text user "${REFERENCE}" (at 23.9 5.35) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 14691005-1065-4366-b3e6-4b3afe2ae0f9)
   )
-  (fp_line (start 50.89 19.15) (end 50.89 -6.45) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.09 19.15) (end 50.89 19.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.09 -6.45) (end -3.09 19.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 50.89 -6.45) (end -3.09 -6.45) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 50.5 18.75) (end 50.5 -6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.7 18.755) (end 50.5 18.755) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.7 -6.05) (end -2.7 18.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start 50.5 -6.055) (end -2.7 -6.055) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 15.24) (end 13.97 10.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 10.16) (end 32.56 10.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.56 10.16) (end 32.56 11.43) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.56 11.43) (end 33.83 11.43) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.83 11.43) (end 33.83 13.97) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.83 13.97) (end 32.56 13.97) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.56 13.97) (end 32.56 15.24) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.56 15.24) (end 13.97 15.24) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.83 2.54) (end 15.24 2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 15.24 2.54) (end 15.24 1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 15.24 1.27) (end 13.97 1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 1.27) (end 13.97 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 -1.27) (end 15.24 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 15.24 -1.27) (end 15.24 -2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 15.24 -2.54) (end 33.83 -2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.83 -2.54) (end 33.83 2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.27 6) (end 21.59 6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 21.59 6) (end 21.59 6.7) (layer F.SilkS) (width 0.12))
-  (fp_line (start 21.59 6.7) (end -1.27 6.7) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.07 6) (end 28.75 6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 28.75 6) (end 28.75 6.7) (layer F.SilkS) (width 0.12))
-  (fp_line (start 28.75 6.7) (end 49.07 6.7) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 16.51) (end 13.97 17.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 17.78) (end 33.83 17.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.83 17.78) (end 33.83 16.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start 46.53 -3.81) (end 33.83 -3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.83 -3.81) (end 33.83 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.83 -5.08) (end 13.97 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 -5.08) (end 13.97 -3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 46.53 16.51) (end 33.83 16.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.27 -3.81) (end 13.97 -3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.27 -3.81) (end 1.27 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.27 -5.08) (end -1.27 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.27 -5.08) (end -1.27 17.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.27 17.78) (end 1.27 17.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.27 17.78) (end 1.27 16.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.27 16.51) (end 13.97 16.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.07 -5.08) (end 46.53 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_line (start 46.53 -5.08) (end 46.53 -3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.07 -5.08) (end 49.07 17.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 49.07 17.78) (end 46.53 17.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 46.53 17.78) (end 46.53 16.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.59 18.645) (end -2.59 -5.945) (layer F.Fab) (width 0.1))
-  (fp_line (start 50.39 18.645) (end 50.39 -5.945) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.59 18.645) (end 50.39 18.645) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.59 -5.945) (end 50.39 -5.945) (layer F.Fab) (width 0.1))
-  (fp_text user + (at -3.81 0) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user - (at -3.81 12.7) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user + (at 12.7 0) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user - (at 35.1 0) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user - (at 12.7 12.7) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user + (at 35.1 12.7) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (pad 1 thru_hole rect (at 0 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 12.7) (size 2 2) (drill 1.02) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 8.64 4) (size 3.45 3.45) (drill 3.45) (layers *.Cu))
-  (pad "" np_thru_hole circle (at 38.61 8.7) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2468_2xAAA.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -2.7 18.755) (end 50.5 18.755) (layer "F.SilkS") (width 0.12) (tstamp 098c53a3-40f6-473e-ae7b-b7730f609a71))
+  (fp_line (start 33.83 -2.54) (end 33.83 2.54) (layer "F.SilkS") (width 0.12) (tstamp 11002f45-3ead-4bb5-9a07-da68672fb078))
+  (fp_line (start 46.53 17.78) (end 46.53 16.51) (layer "F.SilkS") (width 0.12) (tstamp 1281ae0f-b593-4cef-b5bd-66f26a066485))
+  (fp_line (start 13.97 -1.27) (end 15.24 -1.27) (layer "F.SilkS") (width 0.12) (tstamp 189c4545-8937-4842-a4a5-58e0542e7935))
+  (fp_line (start 13.97 1.27) (end 13.97 -1.27) (layer "F.SilkS") (width 0.12) (tstamp 1da1bca9-7c40-497c-8ace-0f275f118ebe))
+  (fp_line (start 15.24 -1.27) (end 15.24 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 2e10c415-5955-40df-a68c-47a8670b50d9))
+  (fp_line (start 13.97 -5.08) (end 13.97 -3.81) (layer "F.SilkS") (width 0.12) (tstamp 38a172b7-1bb7-4055-acba-3b7cfa95f273))
+  (fp_line (start 15.24 -2.54) (end 33.83 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 3d2ce3a6-fb47-47ec-9f8e-a2bc73c13a56))
+  (fp_line (start 28.75 6) (end 28.75 6.7) (layer "F.SilkS") (width 0.12) (tstamp 437c255a-1c0c-4082-9906-c8cff16eb756))
+  (fp_line (start 32.56 13.97) (end 32.56 15.24) (layer "F.SilkS") (width 0.12) (tstamp 438ce293-3e58-433f-9ffc-d9903f3e3d57))
+  (fp_line (start 50.5 18.75) (end 50.5 -6.05) (layer "F.SilkS") (width 0.12) (tstamp 4478ff31-7453-4326-9d37-9f771750d5b9))
+  (fp_line (start 1.27 -3.81) (end 13.97 -3.81) (layer "F.SilkS") (width 0.12) (tstamp 4b0fa0f5-3d36-459d-b882-a1ac915614ab))
+  (fp_line (start 33.83 2.54) (end 15.24 2.54) (layer "F.SilkS") (width 0.12) (tstamp 4d568fd1-2e25-40f2-be54-f229e242b83a))
+  (fp_line (start 1.27 17.78) (end 1.27 16.51) (layer "F.SilkS") (width 0.12) (tstamp 4ec0955c-33fb-47a5-851b-d52a19510682))
+  (fp_line (start 33.83 11.43) (end 33.83 13.97) (layer "F.SilkS") (width 0.12) (tstamp 56b9f885-8759-44ca-8dc5-e107836f005f))
+  (fp_line (start 49.07 -5.08) (end 46.53 -5.08) (layer "F.SilkS") (width 0.12) (tstamp 5a93f6d5-7f10-4fd4-9744-bfebcb77339e))
+  (fp_line (start 49.07 6) (end 28.75 6) (layer "F.SilkS") (width 0.12) (tstamp 6088a537-14e3-4e7a-8c89-9037ddb153c8))
+  (fp_line (start 46.53 -3.81) (end 33.83 -3.81) (layer "F.SilkS") (width 0.12) (tstamp 630e8a5f-db7c-422f-b03b-3413e6e771f6))
+  (fp_line (start 32.56 10.16) (end 32.56 11.43) (layer "F.SilkS") (width 0.12) (tstamp 6c774f5b-dd65-49a3-8bff-9191a84903c0))
+  (fp_line (start 13.97 16.51) (end 13.97 17.78) (layer "F.SilkS") (width 0.12) (tstamp 6f231f98-4124-4799-a07b-ec55733bc6ec))
+  (fp_line (start 49.07 -5.08) (end 49.07 17.78) (layer "F.SilkS") (width 0.12) (tstamp 70cc6c8b-e474-455c-93e8-fd31652caa47))
+  (fp_line (start 15.24 1.27) (end 13.97 1.27) (layer "F.SilkS") (width 0.12) (tstamp 739f7310-646a-47cc-bda1-d7d9ad585e84))
+  (fp_line (start 50.5 -6.055) (end -2.7 -6.055) (layer "F.SilkS") (width 0.12) (tstamp 84e06dc3-3e75-4f10-8a2d-09daadddb5f7))
+  (fp_line (start 32.56 11.43) (end 33.83 11.43) (layer "F.SilkS") (width 0.12) (tstamp 8c38d2cb-7b6d-48b9-836a-68c1a40fb611))
+  (fp_line (start 15.24 2.54) (end 15.24 1.27) (layer "F.SilkS") (width 0.12) (tstamp 8d9d0ab6-a169-4676-8faf-29c01797ff03))
+  (fp_line (start 49.07 17.78) (end 46.53 17.78) (layer "F.SilkS") (width 0.12) (tstamp a1456331-dfff-4ed0-a444-4698ec92fa3c))
+  (fp_line (start 46.53 16.51) (end 33.83 16.51) (layer "F.SilkS") (width 0.12) (tstamp a17b000f-7e99-431e-8aba-9549fb806a51))
+  (fp_line (start 33.83 17.78) (end 33.83 16.51) (layer "F.SilkS") (width 0.12) (tstamp a1a88bc1-2457-4ab4-8079-13ca1091124a))
+  (fp_line (start 46.53 -5.08) (end 46.53 -3.81) (layer "F.SilkS") (width 0.12) (tstamp a3cefa02-ba19-40ad-a0fc-264692ea06c5))
+  (fp_line (start 1.27 -3.81) (end 1.27 -5.08) (layer "F.SilkS") (width 0.12) (tstamp a647881a-e730-42b1-8d89-1ed1b5032d0c))
+  (fp_line (start 13.97 17.78) (end 33.83 17.78) (layer "F.SilkS") (width 0.12) (tstamp aab9f59e-ff96-4d26-b61b-598940fd2f64))
+  (fp_line (start 1.27 -5.08) (end -1.27 -5.08) (layer "F.SilkS") (width 0.12) (tstamp aac23b9a-b1b0-4ce7-84e4-2bd1adaa48c0))
+  (fp_line (start -1.27 17.78) (end 1.27 17.78) (layer "F.SilkS") (width 0.12) (tstamp abcd21cc-98d7-42f4-8bef-aca9b65a49e6))
+  (fp_line (start 33.83 -3.81) (end 33.83 -5.08) (layer "F.SilkS") (width 0.12) (tstamp ac0a9c86-a61c-4764-aa35-d087c2c9c246))
+  (fp_line (start 21.59 6) (end 21.59 6.7) (layer "F.SilkS") (width 0.12) (tstamp aeb7522b-b401-43f4-a425-cc3cbddf6f5c))
+  (fp_line (start 33.83 -5.08) (end 13.97 -5.08) (layer "F.SilkS") (width 0.12) (tstamp b3425d9d-b99e-404f-a3ec-0e55b6800a35))
+  (fp_line (start 21.59 6.7) (end -1.27 6.7) (layer "F.SilkS") (width 0.12) (tstamp b991b9cb-85da-4b5c-9582-e982ed279798))
+  (fp_line (start 33.83 13.97) (end 32.56 13.97) (layer "F.SilkS") (width 0.12) (tstamp babd4993-a158-47e2-835d-c8fda3196efc))
+  (fp_line (start 13.97 10.16) (end 32.56 10.16) (layer "F.SilkS") (width 0.12) (tstamp c3dfa07f-9d15-4053-9015-b7d0372a59fc))
+  (fp_line (start 32.56 15.24) (end 13.97 15.24) (layer "F.SilkS") (width 0.12) (tstamp cae89b2d-2f53-4d1e-a78d-26a9bd7f7ab1))
+  (fp_line (start 1.27 16.51) (end 13.97 16.51) (layer "F.SilkS") (width 0.12) (tstamp d1622ee8-dedc-4310-8359-24351d45e555))
+  (fp_line (start -1.27 -5.08) (end -1.27 17.78) (layer "F.SilkS") (width 0.12) (tstamp d1b22f09-344e-431d-8062-1de3389f4e41))
+  (fp_line (start -2.7 -6.05) (end -2.7 18.75) (layer "F.SilkS") (width 0.12) (tstamp d82524d2-ab58-4ec1-8670-ff478fb3668c))
+  (fp_line (start -1.27 6) (end 21.59 6) (layer "F.SilkS") (width 0.12) (tstamp da44a574-1948-4e02-8eb4-c735b247e116))
+  (fp_line (start 28.75 6.7) (end 49.07 6.7) (layer "F.SilkS") (width 0.12) (tstamp dd6d02b7-db1b-42de-bf94-e7dd499da444))
+  (fp_line (start 13.97 15.24) (end 13.97 10.16) (layer "F.SilkS") (width 0.12) (tstamp f7a214fd-cbf5-480d-adf4-e993b14fcfc7))
+  (fp_line (start 50.89 -6.45) (end -3.09 -6.45) (layer "F.CrtYd") (width 0.05) (tstamp 0342ddbe-e87f-418b-b9f9-33e91811db6c))
+  (fp_line (start -3.09 -6.45) (end -3.09 19.15) (layer "F.CrtYd") (width 0.05) (tstamp 3d0e4ebd-6958-474f-b26a-9a0854fb674b))
+  (fp_line (start 50.89 19.15) (end 50.89 -6.45) (layer "F.CrtYd") (width 0.05) (tstamp c8387f88-df18-4970-b059-a96fd1e8c0b5))
+  (fp_line (start -3.09 19.15) (end 50.89 19.15) (layer "F.CrtYd") (width 0.05) (tstamp fe932c04-f1da-4e6e-aafd-3d73e1098b57))
+  (fp_line (start -2.59 18.645) (end -2.59 -5.945) (layer "F.Fab") (width 0.1) (tstamp 07cb579e-af57-4759-aa22-5d6f38f27407))
+  (fp_line (start -2.59 18.645) (end 50.39 18.645) (layer "F.Fab") (width 0.1) (tstamp 5ae2abec-02b1-4e6b-95d0-c64443591459))
+  (fp_line (start -2.59 -5.945) (end 50.39 -5.945) (layer "F.Fab") (width 0.1) (tstamp 686da5f9-919d-4b18-ac9f-0371e99249e3))
+  (fp_line (start 50.39 18.645) (end 50.39 -5.945) (layer "F.Fab") (width 0.1) (tstamp bd326dee-b023-4dbd-bd75-3e80cb81fb18))
+  (pad "" np_thru_hole circle (at 8.64 4) (size 3.45 3.45) (drill 3.45) (layers *.Cu) (tstamp b9cdf686-762d-4373-8132-a12773ecdb2c))
+  (pad "" np_thru_hole circle (at 38.61 8.7) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask) (tstamp c7264076-aeb1-4e0e-a9d0-793dda2acdce))
+  (pad "1" thru_hole rect (at 0 0) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp ee3b9c91-c0f0-4b83-9142-1b628776eedc))
+  (pad "2" thru_hole circle (at 0 12.7) (size 2 2) (drill 1.02) (layers *.Cu *.Mask) (tstamp 1742149b-7c8d-4018-a557-72c11ea2065b))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2468_2xAAA.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_2479_3xAAA.kicad_mod

@@ -1,40 +1,47 @@
-(module BatteryHolder_Keystone_2479_3xAAA (layer F.Cu) (tedit 5E258953)
+(footprint "BatteryHolder_Keystone_2479_3xAAA" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5E258953)
   (descr "Keystone Battery Holder, 2479, Battery Type 3xAAA (Script generated with StandardBox.py) (Keystone Battery Holder, 2479, Battery Type 3xAAA)")
   (tags "Keystone Battery Holder 2479 Battery Type 3xAAA")
-  (fp_text reference REF** (at -0.09 -8.195) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -0.09 -8.195) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e3761666-3fef-4668-8f6b-9928efb4c58e)
   )
-  (fp_text value BatteryHolder_Keystone_2479_3xAAA (at 23.725 31.495) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_2479_3xAAA" (at 23.725 31.495) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 98836584-86c3-4193-80b1-1d6b40d90f69)
   )
-  (fp_line (start -1.59 -7) (end 50.04 -7) (layer F.Fab) (width 0.1))
-  (fp_line (start 50.04 -7) (end 50.04 30.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 50.04 30.5) (end -2.59 30.5) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.59 30.5) (end -2.59 -6) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.59 -6) (end -1.59 -7) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.09 -4.5) (end -3.09 -7.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.09 -7.5) (end -0.09 -7.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.71 -7.12) (end 50.16 -7.12) (layer F.SilkS) (width 0.12))
-  (fp_line (start 50.16 -7.12) (end 50.16 30.62) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.71 30.62) (end 50.16 30.62) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.71 -7.12) (end -2.71 30.62) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.84 -7.25) (end 50.29 -7.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 50.29 -7.25) (end 50.29 30.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.84 30.75) (end 50.29 30.75) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.84 -7.25) (end -2.84 30.75) (layer F.CrtYd) (width 0.05))
-  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.1) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 12.7) (size 3 3) (drill 1.1) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 23.72 0) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 23.72 23.5) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-  (fp_text user %R (at 23.725 11.75) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text user + (at -4.5 0.05) (layer F.SilkS)
+  (fp_text user "+" (at -4.5 0.05) (layer "F.SilkS")
     (effects (font (size 3 3) (thickness 0.15)))
+    (tstamp ce883969-3568-4eef-aaf7-e0117251a97b)
   )
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2479_3xAAA.wrl
-    (at (xyz 0 0 0))
+  (fp_text user "${REFERENCE}" (at 23.725 11.75) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp edb5c274-56ed-4a9c-8f0b-20c266e6f623)
+  )
+  (fp_line (start -3.09 -4.5) (end -3.09 -7.5) (layer "F.SilkS") (width 0.12) (tstamp 35efb1ec-ffee-4473-b5b6-15d4564199c8))
+  (fp_line (start -2.71 -7.12) (end 50.16 -7.12) (layer "F.SilkS") (width 0.12) (tstamp 45bfdcf6-923e-4e3c-bffa-dbdeac48b919))
+  (fp_line (start -3.09 -7.5) (end -0.09 -7.5) (layer "F.SilkS") (width 0.12) (tstamp 9a3fd0e7-789e-4a12-9e8b-a140d45c68b3))
+  (fp_line (start 50.16 -7.12) (end 50.16 30.62) (layer "F.SilkS") (width 0.12) (tstamp d8fb8460-9995-4713-b5c0-ddb13a3256ae))
+  (fp_line (start -2.71 30.62) (end 50.16 30.62) (layer "F.SilkS") (width 0.12) (tstamp e850d84e-6349-49ec-8f7d-cfc1c4baf7bd))
+  (fp_line (start -2.71 -7.12) (end -2.71 30.62) (layer "F.SilkS") (width 0.12) (tstamp f4fa154b-67b2-4723-a4ae-c40a5e612f53))
+  (fp_line (start 50.29 -7.25) (end 50.29 30.75) (layer "F.CrtYd") (width 0.05) (tstamp 1283991e-d8f5-46bb-93ee-54296b927d1d))
+  (fp_line (start -2.84 -7.25) (end 50.29 -7.25) (layer "F.CrtYd") (width 0.05) (tstamp 3016bd23-15c0-46c9-9500-fe6565fee3fb))
+  (fp_line (start -2.84 30.75) (end 50.29 30.75) (layer "F.CrtYd") (width 0.05) (tstamp 993de02b-f8bb-4aa8-b709-2738ff5f6e3d))
+  (fp_line (start -2.84 -7.25) (end -2.84 30.75) (layer "F.CrtYd") (width 0.05) (tstamp aa2fd942-06f3-420f-a653-d96e4303698c))
+  (fp_line (start -1.59 -7) (end 50.04 -7) (layer "F.Fab") (width 0.1) (tstamp 60dbd8af-57ea-4d87-ad89-4fff00fd03b5))
+  (fp_line (start -2.59 30.5) (end -2.59 -6) (layer "F.Fab") (width 0.1) (tstamp 70b6c369-a88c-4d1e-aba0-d0aa5f9ff90c))
+  (fp_line (start -2.59 -6) (end -1.59 -7) (layer "F.Fab") (width 0.1) (tstamp 9391467e-c05b-4dec-8aaf-a2f6cf8ed49c))
+  (fp_line (start 50.04 -7) (end 50.04 30.5) (layer "F.Fab") (width 0.1) (tstamp b48cff86-2044-4a73-bcf3-ca2190f78147))
+  (fp_line (start 50.04 30.5) (end -2.59 30.5) (layer "F.Fab") (width 0.1) (tstamp e1cba00d-d63f-4b5f-a2af-259ed6057409))
+  (pad "" np_thru_hole circle (at 23.72 23.5) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask) (tstamp 08da747b-b615-4946-b391-8285d56ed7e1))
+  (pad "" np_thru_hole circle (at 23.72 0) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask) (tstamp d5e018d3-a996-4dc6-8c10-d3c15abfd650))
+  (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 1.1) (layers *.Cu *.Mask) (tstamp da6abf01-20b6-473a-8cd8-980baad8c680))
+  (pad "2" thru_hole circle (at 0 12.7) (size 3 3) (drill 1.1) (layers *.Cu *.Mask) (tstamp a0983245-1e12-43ba-bf43-be00d1bbb7ea))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2479_3xAAA.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )
-)
+)

Battery.pretty/BatteryHolder_Keystone_2993.kicad_mod

@@ -1,53 +1,58 @@
-(module BatteryHolder_Keystone_2993 (layer F.Cu) (tedit 57A5D37C)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=776)
+(footprint "BatteryHolder_Keystone_2993" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 57A5D37C)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=776")
   (tags "Keystone type 2993 negative battery contact")
   (attr smd)
-  (fp_text reference REF** (at 0 -6) (layer F.SilkS)
+  (fp_text reference "REF**" (at 0 -6) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp a9d79e05-ced6-4c6d-ad07-55bde0fc214c)
   )
-  (fp_text value BatteryHolder_Keystone_2993 (at 0 6) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_2993" (at 0 6) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2ad3e053-98e9-4762-9f28-87929edc66f8)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp fbbb6245-f338-42de-8906-0a568bb4b189)
   )
-  (fp_line (start 8.65 -2.05) (end 8.65 2.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.95 2.05) (end 8.65 2.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.95 -2.05) (end 8.65 -2.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.95 -5.25) (end 6.95 -2.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.95 5.25) (end 6.95 2.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -8.65 -5.25) (end -8.65 5.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -8.65 -5.25) (end 6.95 -5.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -8.65 5.25) (end 6.95 5.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 8.15 -1.55) (end 8.15 1.55) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.65 1.65) (end -4.65 1.55) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.65 -1.65) (end -4.65 -1.55) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.65 1.55) (end 8.15 1.55) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.65 -1.55) (end 8.15 -1.55) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.45 4.75) (end 6.45 1.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.45 1.65) (end -4.65 1.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.45 -1.65) (end -4.65 -1.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start -8.15 4.75) (end 6.45 4.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.45 -4.75) (end 6.45 -1.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start -8.15 -4.75) (end 6.45 -4.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start -8.15 -4.75) (end -8.15 4.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.8 1.4) (end -4.8 4.6) (layer F.Fab) (width 0.10))
-  (fp_line (start -4.8 -1.4) (end -4.8 -4.6) (layer F.Fab) (width 0.10))
-  (fp_line (start 2.9 -1.8) (end 2.9 -4.6) (layer F.Fab) (width 0.10))
-  (fp_line (start 2.9 1.8) (end 2.9 4.6) (layer F.Fab) (width 0.10))
-  (fp_line (start 6.3 4.6) (end 6.3 1.8) (layer F.Fab) (width 0.10))
-  (fp_line (start 6.3 1.8) (end -4.8 1.8) (layer F.Fab) (width 0.10))
-  (fp_line (start 6.3 4.6) (end -8 4.6) (layer F.Fab) (width 0.10))
-  (fp_line (start -8 -4.6) (end 6.3 -4.6) (layer F.Fab) (width 0.10))
-  (fp_line (start 6.3 -1.8) (end -4.8 -1.8) (layer F.Fab) (width 0.10))
-  (fp_line (start 6.3 -4.6) (end 6.3 -1.8) (layer F.Fab) (width 0.10))
-  (fp_line (start -4.8 -1.4) (end 8 -1.4) (layer F.Fab) (width 0.10))
-  (fp_line (start 8 -1.4) (end 8 1.4) (layer F.Fab) (width 0.10))
-  (fp_line (start 8 1.4) (end -4.8 1.4) (layer F.Fab) (width 0.10))
-  (fp_line (start -8 -4.6) (end -8 4.6) (layer F.Fab) (width 0.10))
-  (pad 1 smd rect (at 0 0) (size 16 2.9) (layers F.Cu F.Paste F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2993.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 6.45 4.75) (end 6.45 1.65) (layer "F.SilkS") (width 0.12) (tstamp 29605af5-6eae-47cb-b29f-abbb24990c74))
+  (fp_line (start -4.65 -1.55) (end 8.15 -1.55) (layer "F.SilkS") (width 0.12) (tstamp 2c9e5996-fb22-49aa-8e6b-544d6cd144f8))
+  (fp_line (start -4.65 -1.65) (end -4.65 -1.55) (layer "F.SilkS") (width 0.12) (tstamp 340d69fd-44ae-479f-86f5-8f9b13110559))
+  (fp_line (start 8.15 -1.55) (end 8.15 1.55) (layer "F.SilkS") (width 0.12) (tstamp 3520583d-6abb-460c-87a6-ed5c9a84c570))
+  (fp_line (start -8.15 4.75) (end 6.45 4.75) (layer "F.SilkS") (width 0.12) (tstamp 56942580-1d88-472f-9860-4a45a37fbf3f))
+  (fp_line (start -4.65 1.55) (end 8.15 1.55) (layer "F.SilkS") (width 0.12) (tstamp 91f5f42b-2646-4f63-ab78-f805cb00272c))
+  (fp_line (start 6.45 -1.65) (end -4.65 -1.65) (layer "F.SilkS") (width 0.12) (tstamp a2066485-f2f2-40ed-970c-9dee38fbda92))
+  (fp_line (start -8.15 -4.75) (end -8.15 4.75) (layer "F.SilkS") (width 0.12) (tstamp ab044cdc-d005-4a1f-a89d-ddcd8d216bba))
+  (fp_line (start -8.15 -4.75) (end 6.45 -4.75) (layer "F.SilkS") (width 0.12) (tstamp bcff7508-ebd4-4b03-9267-6cbd9ec140b8))
+  (fp_line (start 6.45 1.65) (end -4.65 1.65) (layer "F.SilkS") (width 0.12) (tstamp ccc2235a-8894-418e-9c4d-b3f9b019759c))
+  (fp_line (start -4.65 1.65) (end -4.65 1.55) (layer "F.SilkS") (width 0.12) (tstamp d3f2065f-3bb2-4327-80ca-005956722dbb))
+  (fp_line (start 6.45 -4.75) (end 6.45 -1.65) (layer "F.SilkS") (width 0.12) (tstamp ff980c48-a7f5-404b-8fe3-7fe2507518d5))
+  (fp_line (start 6.95 -5.25) (end 6.95 -2.05) (layer "F.CrtYd") (width 0.05) (tstamp 0bcfed80-0242-4f0f-b0c1-c3e9de4b26a7))
+  (fp_line (start -8.65 -5.25) (end 6.95 -5.25) (layer "F.CrtYd") (width 0.05) (tstamp 1e8ba084-66a3-4de5-9311-e3611f491d94))
+  (fp_line (start 6.95 2.05) (end 8.65 2.05) (layer "F.CrtYd") (width 0.05) (tstamp 7f57f9b2-36a1-4f4b-9118-c5272f9f2f08))
+  (fp_line (start 8.65 -2.05) (end 8.65 2.05) (layer "F.CrtYd") (width 0.05) (tstamp a100c991-04a8-417c-94e3-af2ad6c28921))
+  (fp_line (start -8.65 5.25) (end 6.95 5.25) (layer "F.CrtYd") (width 0.05) (tstamp a79e533b-5bbe-444f-a443-121fb57c73bf))
+  (fp_line (start 6.95 5.25) (end 6.95 2.05) (layer "F.CrtYd") (width 0.05) (tstamp b00a2560-6ac7-4dab-8e9a-655248f2d9f5))
+  (fp_line (start 6.95 -2.05) (end 8.65 -2.05) (layer "F.CrtYd") (width 0.05) (tstamp bb684c24-a76d-4d4d-9387-5936363e84e8))
+  (fp_line (start -8.65 -5.25) (end -8.65 5.25) (layer "F.CrtYd") (width 0.05) (tstamp be522136-e562-459b-a2d8-f9c075859bb2))
+  (fp_line (start -8 -4.6) (end -8 4.6) (layer "F.Fab") (width 0.1) (tstamp 03ebc3d2-d66f-4023-afea-4afd0be85ca7))
+  (fp_line (start 2.9 1.8) (end 2.9 4.6) (layer "F.Fab") (width 0.1) (tstamp 1816c0cc-fbad-48f1-a8ac-ab8d0a8f8fd3))
+  (fp_line (start -4.8 -1.4) (end -4.8 -4.6) (layer "F.Fab") (width 0.1) (tstamp 1b50c9bd-4c93-4a23-af31-6ca6127fe155))
+  (fp_line (start -4.8 -1.4) (end 8 -1.4) (layer "F.Fab") (width 0.1) (tstamp 3f71bf27-dde1-4108-8b5e-469647d400ad))
+  (fp_line (start 8 1.4) (end -4.8 1.4) (layer "F.Fab") (width 0.1) (tstamp 666adc47-38de-49fb-a08c-6c69a7c6007d))
+  (fp_line (start -4.8 1.4) (end -4.8 4.6) (layer "F.Fab") (width 0.1) (tstamp 7a6d155c-d62a-4295-9a19-6d3d36a89624))
+  (fp_line (start 6.3 -1.8) (end -4.8 -1.8) (layer "F.Fab") (width 0.1) (tstamp 829dca30-9f00-4d47-b606-2f9552be036a))
+  (fp_line (start 8 -1.4) (end 8 1.4) (layer "F.Fab") (width 0.1) (tstamp 96aed0eb-bf4d-41c1-86ba-7123e120c513))
+  (fp_line (start 6.3 1.8) (end -4.8 1.8) (layer "F.Fab") (width 0.1) (tstamp 9ab92cce-6483-43c8-9d98-48d03ca81a74))
+  (fp_line (start -8 -4.6) (end 6.3 -4.6) (layer "F.Fab") (width 0.1) (tstamp abf5c5b0-07ae-4557-b784-709c030ee7fb))
+  (fp_line (start 6.3 4.6) (end -8 4.6) (layer "F.Fab") (width 0.1) (tstamp ad1b2ab6-7557-4aa0-b506-1a5961706e77))
+  (fp_line (start 6.3 4.6) (end 6.3 1.8) (layer "F.Fab") (width 0.1) (tstamp bd459eb5-c47d-4556-be15-8c47f4a805fe))
+  (fp_line (start 2.9 -1.8) (end 2.9 -4.6) (layer "F.Fab") (width 0.1) (tstamp e1c5edec-6ae2-4481-bd3d-a075b26557bc))
+  (fp_line (start 6.3 -4.6) (end 6.3 -1.8) (layer "F.Fab") (width 0.1) (tstamp e49cf8ad-e623-4761-960a-6804b59433e0))
+  (pad "1" smd rect (at 0 0) (size 16 2.9) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6c196ecb-076f-4c07-91c5-663b89f316f5))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2993.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_2998_1x6.8mm.kicad_mod

@@ -1,42 +1,47 @@
-(module BatteryHolder_Keystone_2998_1x6.8mm (layer F.Cu) (tedit 5E06C333)
-  (descr www.keyelco.com/product-pdf.cfm?p=763)
+(footprint "BatteryHolder_Keystone_2998_1x6.8mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5E06C333)
+  (descr "www.keyelco.com/product-pdf.cfm?p=763")
   (tags "Keystone type 2998 battery holder")
   (attr smd)
-  (fp_text reference REF** (at 0 -4.2) (layer F.SilkS)
+  (fp_text reference "REF**" (at 0 -4.2) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1298c810-f4cb-4513-965f-3c9432a0038f)
   )
-  (fp_text value BatteryHolder_Keystone_2998_1x6.8mm (at 0 5.725) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_2998_1x6.8mm" (at 0 5.725) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1ec1ac27-9db2-40c0-8ca8-8eabe99c9459)
   )
-  (fp_arc (start -3.05 -3.17) (end -2.5 -3.42) (angle -133) (layer F.Fab) (width 0.12))
-  (fp_circle (center 0 0) (end 3.4 0) (layer Dwgs.User) (width 0.1))
-  (fp_line (start -3.7 -3.5) (end -3.7 2.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.7 -3.5) (end 3.7 2.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -3.05 -3.1) (end -2.4 -3.5) (angle -117.603575) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2 4.5) (end 2 4.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start 2 4.5) (end 3.7 2.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2 4.5) (end -3.7 2.5) (layer F.SilkS) (width 0.12))
-  (fp_line (start -5.9 -5.1) (end -5.9 4.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -5.9 4.8) (end 5.9 4.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 5.9 4.8) (end 5.9 -5.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 5.9 -5.1) (end -5.9 -5.1) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 3.05 -3.1) (end 3.703723 -3.5) (angle -117.603575) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 -8) (end -2.4 -3.5) (angle -56.03531623) (layer F.SilkS) (width 0.12))
-  (fp_text user %R (at 0.1 4) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0.1 4) (layer "F.Fab")
     (effects (font (size 0.7 0.7) (thickness 0.15)))
+    (tstamp b9cc331c-e48f-455e-85d2-08f4a57b463c)
   )
-  (fp_line (start -3.6 -3.4) (end -3.6 2.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.6 2.45) (end 3.6 -3.5) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.95 4.4) (end 3.6 2.45) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.95 4.4) (end 1.95 4.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.6 2.45) (end -1.95 4.4) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 -8.03) (end -2.5 -3.43) (angle -56.6) (layer F.Fab) (width 0.1))
-  (fp_arc (start 3.05 -3.15) (end 3.6 -3.44) (angle -125.2183105) (layer F.Fab) (width 0.1))
-  (pad 1 smd rect (at -4.7 0) (size 1.78 5.08) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd rect (at 4.7 0) (size 1.78 5.08) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 0 0) (size 3.96 3.96) (layers F.Cu F.Paste F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2998_1x6.8mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -3.7 -3.5) (end -3.7 2.5) (layer "F.SilkS") (width 0.12) (tstamp 44875376-030d-44ac-ad2f-a4378994345f))
+  (fp_line (start 2 4.5) (end 3.7 2.5) (layer "F.SilkS") (width 0.12) (tstamp 7fec3d9e-8a17-4ba1-9cd8-75943ac91794))
+  (fp_line (start -2 4.5) (end -3.7 2.5) (layer "F.SilkS") (width 0.12) (tstamp a594562a-5de5-49eb-84b3-4c1e81bec0c2))
+  (fp_line (start 3.7 -3.5) (end 3.7 2.5) (layer "F.SilkS") (width 0.12) (tstamp d313cdcc-370b-456a-a8b4-da99074218c3))
+  (fp_line (start -2 4.5) (end 2 4.5) (layer "F.SilkS") (width 0.12) (tstamp f88a8ead-c9e0-47e7-ac28-111f611d274e))
+  (fp_arc (start -3.705648 -3.490673) (mid -3.055452 -3.863197) (end -2.4 -3.5) (layer "F.SilkS") (width 0.12) (tstamp 7ad4958c-65ec-4e35-a678-504c80909356))
+  (fp_arc (start 2.392627 -3.493972) (mid 3.046477 -3.866382) (end 3.703723 -3.5) (layer "F.SilkS") (width 0.12) (tstamp be08bd46-1541-45c5-af42-42fd90a67175))
+  (fp_arc (start 2.391383 -3.495415) (mid -0.00488 -2.900002) (end -2.4 -3.5) (layer "F.SilkS") (width 0.12) (tstamp e618ab6b-cba4-478c-afac-98c58af6359d))
+  (fp_circle (center 0 0) (end 3.4 0) (layer "Dwgs.User") (width 0.1) (fill none) (tstamp a220b761-f21a-46b4-b940-84db19413b2e))
+  (fp_line (start -5.9 4.8) (end 5.9 4.8) (layer "F.CrtYd") (width 0.05) (tstamp 0cefbacd-0212-4ed7-a464-338edb0278fa))
+  (fp_line (start -5.9 -5.1) (end -5.9 4.8) (layer "F.CrtYd") (width 0.05) (tstamp 3d12abe1-d11a-4aa6-b05f-4e65f4c70905))
+  (fp_line (start 5.9 -5.1) (end -5.9 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp 7a035aeb-3b64-4c05-ade7-284b9f998a99))
+  (fp_line (start 5.9 4.8) (end 5.9 -5.1) (layer "F.CrtYd") (width 0.05) (tstamp e57bc808-5bc3-4b36-ae3b-f1b34f96caf4))
+  (fp_line (start 1.95 4.4) (end 3.6 2.45) (layer "F.Fab") (width 0.1) (tstamp 09a998fc-12e1-43b9-97c5-6af3b327c7ad))
+  (fp_line (start 3.6 2.45) (end 3.6 -3.5) (layer "F.Fab") (width 0.1) (tstamp 47e8f734-ff9c-4746-aa7b-02b4b6b6d365))
+  (fp_line (start -3.6 -3.4) (end -3.6 2.4) (layer "F.Fab") (width 0.1) (tstamp 6c023a82-d6f1-4ea7-9e4d-c3c206e7d429))
+  (fp_line (start -1.95 4.4) (end 1.95 4.4) (layer "F.Fab") (width 0.1) (tstamp 819336ef-4f92-443a-95cf-4c53408a9d70))
+  (fp_line (start -3.6 2.45) (end -1.95 4.4) (layer "F.Fab") (width 0.1) (tstamp ee4c9291-0007-4abd-92f0-70b4f896c19d))
+  (fp_arc (start 2.4959 -3.432087) (mid 3.045544 -3.771756) (end 3.6 -3.44) (layer "F.Fab") (width 0.1) (tstamp 17e205ff-e9b2-4e7d-9902-491213fe8e15))
+  (fp_arc (start -3.607938 -3.401745) (mid -3.059953 -3.774071) (end -2.5 -3.42) (layer "F.Fab") (width 0.12) (tstamp 3822dea9-fb3a-42d4-8607-a713202b468d))
+  (fp_arc (start 2.464098 -3.410669) (mid -0.020388 -2.794584) (end -2.5 -3.43) (layer "F.Fab") (width 0.1) (tstamp 5bc3d174-98cc-4a17-9f3b-f094275e6ca2))
+  (pad "1" smd rect (at -4.7 0) (size 1.78 5.08) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8cdc0c26-d75b-4164-8eaf-2da605e0a546))
+  (pad "1" smd rect (at 4.7 0) (size 1.78 5.08) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c0c41f86-8338-4a64-bcb2-39668a177eba))
+  (pad "2" smd rect (at 0 0) (size 3.96 3.96) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6bdf6479-4b69-49b1-b2f5-3c4b3727c297))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_2998_1x6.8mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_3000_1x12mm.kicad_mod

@@ -1,65 +1,70 @@
-(module BatteryHolder_Keystone_3000_1x12mm (layer F.Cu) (tedit 5D9CBDF8)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=777)
+(footprint "BatteryHolder_Keystone_3000_1x12mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5D9CBDF8)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=777")
   (tags "Keystone type 3000 coin cell retainer")
   (attr smd)
-  (fp_text reference REF** (at 0 -8) (layer F.SilkS)
+  (fp_text reference "REF**" (at 0 -8) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 7823a71b-fd9d-4190-b9d2-1abc00e5e1e8)
   )
-  (fp_text value BatteryHolder_Keystone_3000_1x12mm (at 0 7.5) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_3000_1x12mm" (at 0 7.5) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp ee7eb240-3c5e-40a5-8e12-0ce46270a062)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e851caa1-b77b-468d-9ef2-73764a7a044f)
   )
-  (fp_arc (start 5.29 4.8) (end 5.29 6.76) (angle -90) (layer F.CrtYd) (width 0.05))
-  (fp_circle (center 0 0) (end 0 6.25) (layer Dwgs.User) (width 0.15))
-  (fp_arc (start 5.29 4.6) (end 4.5 5.2) (angle -60) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -5.29 4.6) (end -4.5 5.2) (angle 60) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 5.29 4.6) (end 4.6 5.1) (angle -60) (layer F.Fab) (width 0.1))
-  (fp_arc (start -5.29 4.6) (end -4.6 5.1) (angle 60) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 8.9) (end -4.6 5.1) (angle 101) (layer F.Fab) (width 0.1))
-  (fp_arc (start -5.29 4.8) (end -5.29 6.76) (angle 90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 5.25 4.1) (end 5.3 5.6) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -5.25 4.1) (end -5.3 5.6) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_line (start -7.25 2.15) (end -7.25 4.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.25 2.15) (end 7.25 4.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.75 2) (end 6.75 4.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.75 2) (end -6.75 4.1) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 5.25 4.1) (end 5.3 5.45) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_line (start 7.25 -2.15) (end 7.25 -3.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.25 -3.8) (end 4.65 -6.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.65 -6.4) (end 4.65 -7.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.65 -7.35) (end 4.65 -7.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.65 -6.4) (end -4.65 -7.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -7.25 -3.8) (end -4.65 -6.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -7.25 -2.15) (end -7.25 -3.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -6.75 -2) (end -6.75 -3.45) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.75 -3.45) (end -4.15 -6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.15 -6.05) (end -4.15 -6.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.15 -6.85) (end 4.15 -6.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.15 -6.85) (end 4.15 -6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.15 -6.05) (end 6.75 -3.45) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.75 -3.45) (end 6.75 -2) (layer F.SilkS) (width 0.12))
-  (fp_line (start -7.25 -2.15) (end -10.15 -2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -10.15 -2.15) (end -10.15 2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -10.15 2.15) (end -7.25 2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.25 -2.15) (end 10.15 -2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 10.15 -2.15) (end 10.15 2.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 10.15 2.15) (end 7.25 2.15) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -5.25 4.1) (end -5.3 5.45) (angle 90) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.6 -3.4) (end 6.6 4.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.6 -3.4) (end -6.6 4.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 4 -6) (end 6.6 -3.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -6) (end -6.6 -3.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 4 -6.7) (end 4 -6) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -6.7) (end -4 -6) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -6.7) (end 4 -6.7) (layer F.Fab) (width 0.1))
-  (fp_line (start -5.29 6.76) (end 5.29 6.76) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd rect (at -7.9 0) (size 3.5 3.3) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd rect (at 7.9 0) (size 3.5 3.3) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd circle (at 0 0) (size 10.2 10.2) (layers F.Cu F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3000_1x12mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 4.15 -6.85) (end 4.15 -6.05) (layer "F.SilkS") (width 0.12) (tstamp 18e75ee9-e75d-41e6-8f0f-929b0b9f4c9a))
+  (fp_line (start -4.15 -6.85) (end 4.15 -6.85) (layer "F.SilkS") (width 0.12) (tstamp 365943cc-432d-4253-8fe9-e4fe5b28e158))
+  (fp_line (start -4.15 -6.05) (end -4.15 -6.85) (layer "F.SilkS") (width 0.12) (tstamp 588184ec-982e-40fa-a5c4-4511efd80e43))
+  (fp_line (start -6.75 -3.45) (end -4.15 -6.05) (layer "F.SilkS") (width 0.12) (tstamp 5a29bdea-ec25-45f8-9126-04475a358b03))
+  (fp_line (start -6.75 2) (end -6.75 4.1) (layer "F.SilkS") (width 0.12) (tstamp 7dfad1e4-4760-43ac-b324-aacc2a5152c5))
+  (fp_line (start 6.75 2) (end 6.75 4.1) (layer "F.SilkS") (width 0.12) (tstamp 8da53b4d-4723-48c6-b1a0-d72f89f217a6))
+  (fp_line (start -6.75 -2) (end -6.75 -3.45) (layer "F.SilkS") (width 0.12) (tstamp d69d98bc-1528-434c-b95b-a8f3b19a3196))
+  (fp_line (start 6.75 -3.45) (end 6.75 -2) (layer "F.SilkS") (width 0.12) (tstamp de5e284c-aa3c-4c71-a646-7192f9633263))
+  (fp_line (start 4.15 -6.05) (end 6.75 -3.45) (layer "F.SilkS") (width 0.12) (tstamp e1919e36-98c3-439a-8022-f10af5283d29))
+  (fp_arc (start -5.3 5.6) (mid -6.346016 5.125305) (end -6.75 4.05) (layer "F.SilkS") (width 0.12) (tstamp 16857d58-e828-4e23-958d-6ed6d17ad842))
+  (fp_arc (start 6.75 4.05) (mid 6.346016 5.125305) (end 5.3 5.6) (layer "F.SilkS") (width 0.12) (tstamp ae449776-577c-4933-be5b-a7c68118c1a9))
+  (fp_arc (start 5.414615 5.58416) (mid 4.90584 5.514615) (end 4.5 5.2) (layer "F.SilkS") (width 0.12) (tstamp e7dad9af-e4e3-415c-8cbc-3be4746954c0))
+  (fp_arc (start -4.5 5.2) (mid -4.90584 5.514615) (end -5.414615 5.58416) (layer "F.SilkS") (width 0.12) (tstamp fa14ed34-300c-4211-a04a-77a5667fcd28))
+  (fp_circle (center 0 0) (end 0 6.25) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp d293fe06-3eb9-4d0c-92ae-550c1be21098))
+  (fp_line (start -7.25 -2.15) (end -10.15 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp 1672232f-5322-4bb2-9913-377d22f45f17))
+  (fp_line (start -5.29 6.76) (end 5.29 6.76) (layer "F.CrtYd") (width 0.05) (tstamp 2baef159-193d-4f5a-875b-21c1ab65ed5a))
+  (fp_line (start -7.25 2.15) (end -7.25 4.8) (layer "F.CrtYd") (width 0.05) (tstamp 30066f78-292a-4272-8bea-945d7b546d2b))
+  (fp_line (start 7.25 -3.8) (end 4.65 -6.4) (layer "F.CrtYd") (width 0.05) (tstamp 49e39236-2c3e-4ded-bb97-713e9ef38774))
+  (fp_line (start 10.15 2.15) (end 7.25 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 5f7db64a-5ad2-4212-ae81-432bbf498784))
+  (fp_line (start -4.65 -7.35) (end 4.65 -7.35) (layer "F.CrtYd") (width 0.05) (tstamp 6cd6af6c-1cfb-4700-baf2-33e9df2b8b03))
+  (fp_line (start -10.15 2.15) (end -7.25 2.15) (layer "F.CrtYd") (width 0.05) (tstamp 6e6d65d2-cb37-4e57-abd6-1093133fa0de))
+  (fp_line (start 4.65 -6.4) (end 4.65 -7.35) (layer "F.CrtYd") (width 0.05) (tstamp 798dfe62-d3c2-44ed-95ec-b0b5566464f9))
+  (fp_line (start 7.25 -2.15) (end 7.25 -3.8) (layer "F.CrtYd") (width 0.05) (tstamp 8702ea70-5df3-41ed-8a80-73d446b05d5a))
+  (fp_line (start -7.25 -3.8) (end -4.65 -6.4) (layer "F.CrtYd") (width 0.05) (tstamp 93e309be-c5d4-40c0-875d-dc561a50e32c))
+  (fp_line (start 7.25 -2.15) (end 10.15 -2.15) (layer "F.CrtYd") (width 0.05) (tstamp a00a2be9-c92c-4fe4-8732-dda9d09036fc))
+  (fp_line (start -7.25 -2.15) (end -7.25 -3.8) (layer "F.CrtYd") (width 0.05) (tstamp a982bd8b-b49b-4351-934e-f5aed3fcb614))
+  (fp_line (start -4.65 -6.4) (end -4.65 -7.35) (layer "F.CrtYd") (width 0.05) (tstamp bb194e43-a381-4e13-8e75-0fb370c4be42))
+  (fp_line (start 10.15 -2.15) (end 10.15 2.15) (layer "F.CrtYd") (width 0.05) (tstamp c0a58132-a3b6-4984-9acf-92465644eabe))
+  (fp_line (start -10.15 -2.15) (end -10.15 2.15) (layer "F.CrtYd") (width 0.05) (tstamp cc098443-3c7b-4024-893c-dc7ee6e60f53))
+  (fp_line (start 7.25 2.15) (end 7.25 4.8) (layer "F.CrtYd") (width 0.05) (tstamp d9754ca0-e667-4074-a3ce-712c9da53ab1))
+  (fp_arc (start -5.29 6.76) (mid -6.675929 6.185929) (end -7.25 4.8) (layer "F.CrtYd") (width 0.05) (tstamp 610f93e9-cd38-49f6-9663-073543809e98))
+  (fp_arc (start 7.25 4.8) (mid 6.675929 6.185929) (end 5.29 6.76) (layer "F.CrtYd") (width 0.05) (tstamp 8af7a4e9-6070-4c49-ae4c-eac3cdd3109f))
+  (fp_line (start -4 -6) (end -6.6 -3.4) (layer "F.Fab") (width 0.1) (tstamp 293cedfa-be7b-4fee-9804-7f8c63dafa88))
+  (fp_line (start -4 -6.7) (end 4 -6.7) (layer "F.Fab") (width 0.1) (tstamp 63551618-3711-4fc5-8f5c-d88cbf0d0bfe))
+  (fp_line (start 6.6 -3.4) (end 6.6 4.1) (layer "F.Fab") (width 0.1) (tstamp 66cc7218-6ac0-46bd-9679-98ee932ccc80))
+  (fp_line (start 4 -6) (end 6.6 -3.4) (layer "F.Fab") (width 0.1) (tstamp 6e20f114-3a0a-42e0-9fa0-ebc8fc12d292))
+  (fp_line (start -4 -6.7) (end -4 -6) (layer "F.Fab") (width 0.1) (tstamp b8b45480-ca6d-4997-a378-ba5d47046ae8))
+  (fp_line (start -6.6 -3.4) (end -6.6 4.1) (layer "F.Fab") (width 0.1) (tstamp c05fbc8d-27ff-4c17-afd5-3cd720853080))
+  (fp_line (start 4 -6.7) (end 4 -6) (layer "F.Fab") (width 0.1) (tstamp ef8313bb-b7f9-4bce-91b1-c3017de825d5))
+  (fp_arc (start 5.378013 5.447558) (mid 4.942442 5.378013) (end 4.6 5.1) (layer "F.Fab") (width 0.1) (tstamp 2e8c803b-1a46-4d3d-ad07-9308246fd07e))
+  (fp_arc (start -5.3 5.45) (mid -6.239949 5.019239) (end -6.6 4.05) (layer "F.Fab") (width 0.1) (tstamp 74bdbf6c-8528-48d3-9d91-6a14b1f708b8))
+  (fp_arc (start -4.6 5.1) (mid 0.006214 2.93343) (end 4.607905 5.109589) (layer "F.Fab") (width 0.1) (tstamp 7df1b571-2c13-42e1-807c-2dba06f6a660))
+  (fp_arc (start 6.6 4.05) (mid 6.239949 5.019239) (end 5.3 5.45) (layer "F.Fab") (width 0.1) (tstamp 87d27f62-3866-43bd-a9dd-309ebd0be200))
+  (fp_arc (start -4.6 5.1) (mid -4.942443 5.378013) (end -5.378013 5.447558) (layer "F.Fab") (width 0.1) (tstamp dc7acf70-a5dc-4afb-a054-9e061d907ee7))
+  (pad "1" smd rect (at -7.9 0) (size 3.5 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c6e6db5f-b056-4e15-8f37-f7f199ae02fe))
+  (pad "1" smd rect (at 7.9 0) (size 3.5 3.3) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp efa20705-c55e-443f-a19c-aebae4a5e95f))
+  (pad "2" smd circle (at 0 0) (size 10.2 10.2) (layers "F.Cu" "F.Mask") (tstamp 1ba33272-8e7d-454c-95b8-82926b8b6ff7))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3000_1x12mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_3001_1x12mm.kicad_mod

@@ -1,65 +1,71 @@
-(module BatteryHolder_Keystone_3001_1x12mm (layer F.Cu) (tedit 5D9CBE05)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=778)
+(footprint "BatteryHolder_Keystone_3001_1x12mm" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5D9CBE05)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=778")
   (tags "Keystone type 3001 coin cell retainer")
-  (fp_text reference REF** (at 0 -8) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -8) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e33acabd-2cc4-4459-801f-fdb961995ae5)
   )
-  (fp_text value BatteryHolder_Keystone_3001_1x12mm (at 0 7.5) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_3001_1x12mm" (at 0 7.5) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 4252bf2b-264c-486a-8820-ce9f34d9e1e5)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 6bce82ce-e6d2-48f9-a753-46178c677c3c)
   )
-  (fp_arc (start 0 0) (end 0 6.75) (angle 36.6) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0.11 9.15) (end 4.22 5.65) (angle -3.1) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0.11 9.15) (end -4.22 5.65) (angle 3.1) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 0) (end 0 6.75) (angle -36.6) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 5.25 4.1) (end 5.3 6.1) (angle -90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 5.29 4.6) (end 4.22 5.65) (angle -54.1) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -5.29 4.6) (end -4.22 5.65) (angle 54.1) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 6.6 0) (end 7.25 1.95) (angle -143) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -6.6 0) (end -7.25 1.95) (angle 143) (layer F.CrtYd) (width 0.05))
-  (fp_circle (center 0 0) (end 0 6.25) (layer Dwgs.User) (width 0.15))
-  (fp_arc (start 5.29 4.6) (end 4.5 5.2) (angle -60) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -5.29 4.6) (end -4.5 5.2) (angle 60) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 5.29 4.6) (end 4.6 5.1) (angle -60) (layer F.Fab) (width 0.1))
-  (fp_arc (start -5.29 4.6) (end -4.6 5.1) (angle 60) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 8.9) (end -4.6 5.1) (angle 101) (layer F.Fab) (width 0.1))
-  (fp_arc (start 5.25 4.1) (end 5.3 5.6) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -5.25 4.1) (end -5.3 5.6) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -5.25 4.1) (end -5.3 6.1) (angle 90) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -7.25 1.95) (end -7.25 4.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.25 1.95) (end 7.25 4.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.75 1.8) (end 6.75 4.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.75 1.8) (end -6.75 4.1) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 5.25 4.1) (end 5.3 5.45) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_line (start 7.25 -1.95) (end 7.25 -3.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.25 -3.8) (end 4.65 -6.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.65 -6.4) (end 4.65 -7.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.65 -7.35) (end 4.65 -7.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.65 -6.4) (end -4.65 -7.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -7.25 -3.8) (end -4.65 -6.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -7.25 -1.95) (end -7.25 -3.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -6.75 -1.8) (end -6.75 -3.45) (layer F.SilkS) (width 0.12))
-  (fp_line (start -6.75 -3.45) (end -4.15 -6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.15 -6.05) (end -4.15 -6.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.15 -6.85) (end 4.15 -6.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.15 -6.85) (end 4.15 -6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.15 -6.05) (end 6.75 -3.45) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.75 -3.45) (end 6.75 -1.8) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -5.25 4.1) (end -5.3 5.45) (angle 90) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.6 -3.4) (end 6.6 4.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -6.6 -3.4) (end -6.6 4.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 4 -6) (end 6.6 -3.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -6) (end -6.6 -3.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 4 -6.7) (end 4 -6) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -6.7) (end -4 -6) (layer F.Fab) (width 0.1))
-  (fp_line (start -4 -6.7) (end 4 -6.7) (layer F.Fab) (width 0.1))
-  (pad 1 thru_hole circle (at -6.6 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 6.6 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask))
-  (pad 2 smd circle (at 0 0) (size 9 9) (layers F.Cu F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3001_1x12mm.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -6.75 1.8) (end -6.75 4.1) (layer "F.SilkS") (width 0.12) (tstamp 091442bd-109f-47f2-815f-56956795ae4d))
+  (fp_line (start 4.15 -6.85) (end 4.15 -6.05) (layer "F.SilkS") (width 0.12) (tstamp 3f4b403a-daa7-4dca-a7fa-c03fc3bbea7d))
+  (fp_line (start -6.75 -3.45) (end -4.15 -6.05) (layer "F.SilkS") (width 0.12) (tstamp 7d006780-0ae7-491d-933a-d25f34162d2f))
+  (fp_line (start -6.75 -1.8) (end -6.75 -3.45) (layer "F.SilkS") (width 0.12) (tstamp adc775f4-c559-47e2-bf73-2bed05a51e14))
+  (fp_line (start 6.75 1.8) (end 6.75 4.1) (layer "F.SilkS") (width 0.12) (tstamp b93ccf11-b3ab-4389-bcf4-fdc2676057ed))
+  (fp_line (start -4.15 -6.05) (end -4.15 -6.85) (layer "F.SilkS") (width 0.12) (tstamp bc92b68f-5b5a-4038-842c-c7daf018ff1d))
+  (fp_line (start -4.15 -6.85) (end 4.15 -6.85) (layer "F.SilkS") (width 0.12) (tstamp dfcca7d0-93fb-49a5-b059-045af5f9d988))
+  (fp_line (start 4.15 -6.05) (end 6.75 -3.45) (layer "F.SilkS") (width 0.12) (tstamp f6cb39e3-553c-454a-9528-fe04a4cbf0f8))
+  (fp_line (start 6.75 -3.45) (end 6.75 -1.8) (layer "F.SilkS") (width 0.12) (tstamp fb05ff7c-adf4-482e-817a-5cf2d0ac0e3e))
+  (fp_arc (start -4.5 5.2) (mid -4.90584 5.514615) (end -5.414615 5.58416) (layer "F.SilkS") (width 0.12) (tstamp 12a456d3-7db1-45c3-a9b6-2fb87bfa9dca))
+  (fp_arc (start 6.75 4.05) (mid 6.346016 5.125305) (end 5.3 5.6) (layer "F.SilkS") (width 0.12) (tstamp 51fde596-30af-4232-9251-6120ab911547))
+  (fp_arc (start 5.414615 5.58416) (mid 4.90584 5.514615) (end 4.5 5.2) (layer "F.SilkS") (width 0.12) (tstamp cadb4bea-d601-4dc2-b995-e8454dd64fbc))
+  (fp_arc (start -5.3 5.6) (mid -6.346016 5.125305) (end -6.75 4.05) (layer "F.SilkS") (width 0.12) (tstamp ea2ed6bf-34e8-4e2f-8352-429b385317bb))
+  (fp_circle (center 0 0) (end 0 6.25) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 2f97207c-69d5-4caf-83c1-25c5ba3ad629))
+  (fp_line (start -7.25 -1.95) (end -7.25 -3.8) (layer "F.CrtYd") (width 0.05) (tstamp 0775b1f3-8aa4-4bad-b1a0-20364f6eafc8))
+  (fp_line (start -4.65 -6.4) (end -4.65 -7.35) (layer "F.CrtYd") (width 0.05) (tstamp 3e5c5a8e-7f7e-41df-9da4-85ee69f02582))
+  (fp_line (start 7.25 1.95) (end 7.25 4.1) (layer "F.CrtYd") (width 0.05) (tstamp 529c99de-b65f-4bb2-8a4b-861db6bcffd6))
+  (fp_line (start -7.25 -3.8) (end -4.65 -6.4) (layer "F.CrtYd") (width 0.05) (tstamp 9cc0ba84-b934-479d-b590-f0ac824856d6))
+  (fp_line (start 4.65 -6.4) (end 4.65 -7.35) (layer "F.CrtYd") (width 0.05) (tstamp a33f1e49-b0c5-4df0-ad6e-ba004af37c32))
+  (fp_line (start 7.25 -3.8) (end 4.65 -6.4) (layer "F.CrtYd") (width 0.05) (tstamp a3e992d2-396f-4c14-ae1a-e5fceb0c21fc))
+  (fp_line (start -4.65 -7.35) (end 4.65 -7.35) (layer "F.CrtYd") (width 0.05) (tstamp a8d82198-b589-41e0-b733-08636597c5e1))
+  (fp_line (start 7.25 -1.95) (end 7.25 -3.8) (layer "F.CrtYd") (width 0.05) (tstamp eec10527-bb92-4fe1-b599-080f4f2ba831))
+  (fp_line (start -7.25 1.95) (end -7.25 4.1) (layer "F.CrtYd") (width 0.05) (tstamp faea14a9-271d-4562-a99b-0b37130e581b))
+  (fp_arc (start -4.22 5.65) (mid -4.123743 5.534157) (end -4.024388 5.42096) (layer "F.CrtYd") (width 0.05) (tstamp 768511fd-91a4-4e35-aac3-9d23f7ab126f))
+  (fp_arc (start -4.22 5.65) (mid -4.814553 6.021742) (end -5.513125 6.082436) (layer "F.CrtYd") (width 0.05) (tstamp 79aad2cb-d0a2-4a67-a640-6a6d4b464b69))
+  (fp_arc (start 7.25 4.05) (mid 6.699569 5.478858) (end 5.3 6.1) (layer "F.CrtYd") (width 0.05) (tstamp 9fe5dbee-6ee4-41e1-835e-3c212595db61))
+  (fp_arc (start 4.02471 5.432858) (mid 4.123824 5.540108) (end 4.22 5.65) (layer "F.CrtYd") (width 0.05) (tstamp a0da5399-a4a9-4ecf-8711-94fe8d8cc2ee))
+  (fp_arc (start 5.513125 6.082436) (mid 4.814553 6.021742) (end 4.22 5.65) (layer "F.CrtYd") (width 0.05) (tstamp b5812f4d-9fdf-45c7-886f-da060c717c6d))
+  (fp_arc (start 0 6.75) (mid -2.119449 6.408622) (end -4.024518 5.419018) (layer "F.CrtYd") (width 0.05) (tstamp b71b17c6-1a14-4313-8ce7-adcee494eed7))
+  (fp_arc (start -7.25 1.95) (mid -8.655479 0.002334) (end -7.254426 -1.948519) (layer "F.CrtYd") (width 0.05) (tstamp d496240b-ac28-4ebc-9b1b-d77bf8f0644c))
+  (fp_arc (start -5.3 6.1) (mid -6.699569 5.478858) (end -7.25 4.05) (layer "F.CrtYd") (width 0.05) (tstamp d58b7392-074c-46df-ae2e-ae96424de641))
+  (fp_arc (start 7.254426 -1.948519) (mid 8.655479 0.002334) (end 7.25 1.95) (layer "F.CrtYd") (width 0.05) (tstamp e4540395-f23d-40b3-b052-dcc03b8e284b))
+  (fp_arc (start 4.024518 5.419018) (mid 2.119449 6.408622) (end 0 6.75) (layer "F.CrtYd") (width 0.05) (tstamp fd82df94-1ece-4f65-a110-a09ad0149492))
+  (fp_line (start 4 -6.7) (end 4 -6) (layer "F.Fab") (width 0.1) (tstamp 01be2abf-57c3-46ad-81fe-2da5be1b1601))
+  (fp_line (start 4 -6) (end 6.6 -3.4) (layer "F.Fab") (width 0.1) (tstamp 156d8b32-9415-4ffa-805b-de05163831a4))
+  (fp_line (start 6.6 -3.4) (end 6.6 4.1) (layer "F.Fab") (width 0.1) (tstamp 1ba70234-7b1b-4ed3-9134-5b92a2064ccf))
+  (fp_line (start -4 -6.7) (end -4 -6) (layer "F.Fab") (width 0.1) (tstamp 227b7556-9f86-41bc-8103-e54df81c5dd4))
+  (fp_line (start -4 -6.7) (end 4 -6.7) (layer "F.Fab") (width 0.1) (tstamp 4d53ae44-11ca-4045-abe0-d6a78aa585e7))
+  (fp_line (start -6.6 -3.4) (end -6.6 4.1) (layer "F.Fab") (width 0.1) (tstamp 6465bd7f-f6ad-403b-9f42-10888b2628f2))
+  (fp_line (start -4 -6) (end -6.6 -3.4) (layer "F.Fab") (width 0.1) (tstamp 69261818-2739-4c1e-a9d1-5bd6bb2068b0))
+  (fp_arc (start 6.6 4.05) (mid 6.239949 5.019239) (end 5.3 5.45) (layer "F.Fab") (width 0.1) (tstamp 9138c8bf-0b7e-45f9-bb0b-1eee887efa38))
+  (fp_arc (start 5.378013 5.447558) (mid 4.942442 5.378013) (end 4.6 5.1) (layer "F.Fab") (width 0.1) (tstamp 9f561f85-97ec-475d-b0e0-50a6610577f0))
+  (fp_arc (start -4.6 5.1) (mid -4.942443 5.378013) (end -5.378013 5.447558) (layer "F.Fab") (width 0.1) (tstamp aade6bea-b8e8-40e2-a9d4-3d9641cdc665))
+  (fp_arc (start -4.6 5.1) (mid 0.006214 2.93343) (end 4.607905 5.109589) (layer "F.Fab") (width 0.1) (tstamp f330639c-0c4c-4bb4-8063-8ef4f1f3568f))
+  (fp_arc (start -5.3 5.45) (mid -6.239949 5.019239) (end -6.6 4.05) (layer "F.Fab") (width 0.1) (tstamp f559465c-1fef-426b-9524-aca85827e0fd))
+  (pad "1" thru_hole circle (at 6.6 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask) (tstamp 4916a33c-d18e-472e-be4a-a1c6e1a446b1))
+  (pad "1" thru_hole circle (at -6.6 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask) (tstamp ba53345f-47ac-4b99-a046-64359faed535))
+  (pad "2" smd circle (at 0 0) (size 9 9) (layers "F.Cu" "F.Mask") (tstamp b20eb91a-6e35-48e5-a1da-f9fbcc5a0dc7))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3001_1x12mm.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_3002_1x2032.kicad_mod

@@ -1,64 +1,69 @@
-(module BatteryHolder_Keystone_3002_1x2032 (layer F.Cu) (tedit 5D9C7E9A)
-  (descr https://www.tme.eu/it/Document/a823211ec201a9e209042d155fe22d2b/KEYS2996.pdf)
+(footprint "BatteryHolder_Keystone_3002_1x2032" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5D9C7E9A)
+  (descr "https://www.tme.eu/it/Document/a823211ec201a9e209042d155fe22d2b/KEYS2996.pdf")
   (tags "BR2016 CR2016 DL2016 BR2020 CL2020 BR2025 CR2025 DL2025 DR2032 CR2032 DL2032")
   (attr smd)
-  (fp_text reference REF** (at -9.15 9.7) (layer F.SilkS)
+  (fp_text reference "REF**" (at -9.15 9.7) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp d4a83fe1-041a-4d2e-8f65-e8aa853936fb)
   )
-  (fp_text value BatteryHolder_Keystone_3002_1x2032 (at 0 -11) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_3002_1x2032" (at 0 -11) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp ae0f9508-1f89-4909-b2fb-73e97d9c36ce)
   )
-  (fp_text user %R (at -9.15 9.7) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at -9.15 9.7) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 4a6e24ab-adcb-4e41-937d-3bf2013e7a55)
   )
-  (fp_line (start 15.55 -2.75) (end 10.75 -2.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start 15.55 2.75) (end 15.55 -2.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start 10.75 2.75) (end 15.55 2.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start -15.55 2.75) (end -10.75 2.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start -15.55 -2.75) (end -15.55 2.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start -10.75 -2.75) (end -15.55 -2.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start -15.85 3.05) (end -15.85 -3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -11.05 3.05) (end -15.85 3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -11.05 6.35) (end -11.05 3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.3 11.1) (end -11.05 6.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.3 11.1) (end -4.3 11.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.05 6.35) (end 4.3 11.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.05 3.05) (end 11.05 6.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 15.85 3.05) (end 11.05 3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 15.85 -3.05) (end 15.85 3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.05 -3.05) (end 15.85 -3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.05 -9.8) (end 11.05 -3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 11.05 -9.8) (end 3.9 -9.8) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 0) (end 3.9 -9.8) (angle -43.40107348) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -11.05 -9.8) (end -3.9 -9.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -11.05 -3.05) (end -11.05 -9.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -15.85 -3.05) (end -11.05 -3.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 10.55 -9.5) (end 3.85 -9.5) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 0) (end 3.85 -9.5) (angle -44.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -10.55 -9.5) (end -3.85 -9.5) (layer F.SilkS) (width 0.12))
-  (fp_circle (center 0 0) (end 10 0) (layer Dwgs.User) (width 0.2))
-  (fp_line (start 10.55 5.9) (end 3.8 10.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.95 10.85) (end 10.75 6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.95 10.85) (end 3.95 10.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start -10.8 6.05) (end -3.95 10.85) (layer F.SilkS) (width 0.12))
-  (fp_line (start -10.55 5.85) (end -3.8 10.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -10.55 -2.55) (end -10.55 -9.3) (layer F.Fab) (width 0.1))
-  (fp_line (start 10.55 -9.3) (end -10.55 -9.3) (layer F.Fab) (width 0.1))
-  (fp_line (start 10.55 -2.55) (end 10.55 -9.3) (layer F.Fab) (width 0.1))
-  (fp_line (start 15.35 -2.55) (end 10.55 -2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start 15.35 2.55) (end 15.35 -2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start 10.55 2.55) (end 15.35 2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.8 10.6) (end 3.8 10.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 10.55 2.55) (end 10.55 5.9) (layer F.Fab) (width 0.1))
-  (fp_line (start -10.55 2.55) (end -10.55 5.85) (layer F.Fab) (width 0.1))
-  (fp_line (start -15.35 -2.55) (end -10.55 -2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start -15.35 2.55) (end -10.55 2.55) (layer F.Fab) (width 0.1))
-  (fp_line (start -15.35 -2.55) (end -15.35 2.55) (layer F.Fab) (width 0.1))
-  (pad 1 smd rect (at 12.8 0) (size 5.1 5.1) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd rect (at -12.8 0) (size 5.1 5.1) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd circle (at 0 0) (size 17.8 17.8) (layers F.Cu F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3002_1x2032.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -15.55 -2.75) (end -15.55 2.75) (layer "F.SilkS") (width 0.12) (tstamp 0cbd5658-51a7-4e55-b1a1-24c06f4a65c7))
+  (fp_line (start 10.75 2.75) (end 15.55 2.75) (layer "F.SilkS") (width 0.12) (tstamp 23c33de8-d4b8-48d3-b262-06c6192fc3f0))
+  (fp_line (start 15.55 -2.75) (end 10.75 -2.75) (layer "F.SilkS") (width 0.12) (tstamp 3f65814f-8498-48c2-a1a4-1727ac14f176))
+  (fp_line (start -10.55 -9.5) (end -3.85 -9.5) (layer "F.SilkS") (width 0.12) (tstamp 5385653f-e475-43af-9fed-74f58572e205))
+  (fp_line (start 15.55 2.75) (end 15.55 -2.75) (layer "F.SilkS") (width 0.12) (tstamp 6b023223-824b-491b-9c9d-71c2e1880750))
+  (fp_line (start 3.95 10.85) (end 10.75 6.05) (layer "F.SilkS") (width 0.12) (tstamp 9430d349-6de1-48c0-a102-c8e8b50819e3))
+  (fp_line (start -10.75 -2.75) (end -15.55 -2.75) (layer "F.SilkS") (width 0.12) (tstamp 9f4ed33c-b24a-46fa-9a18-b95c3addf49a))
+  (fp_line (start -15.55 2.75) (end -10.75 2.75) (layer "F.SilkS") (width 0.12) (tstamp bad6e014-6b08-4343-bb72-6d483f482e4f))
+  (fp_line (start 10.55 -9.5) (end 3.85 -9.5) (layer "F.SilkS") (width 0.12) (tstamp d769cf9f-4651-4316-8320-cf3ac02f52c5))
+  (fp_line (start -10.8 6.05) (end -3.95 10.85) (layer "F.SilkS") (width 0.12) (tstamp e6c534c0-b511-43ef-8b77-86a61b6ba9ea))
+  (fp_line (start -3.95 10.85) (end 3.95 10.85) (layer "F.SilkS") (width 0.12) (tstamp fb10227d-c3bb-44ba-a173-20db722af65d))
+  (fp_arc (start -3.846385 -9.501464) (mid 0.00195 -10.250487) (end 3.85 -9.5) (layer "F.SilkS") (width 0.12) (tstamp eafbc2aa-7287-4907-a7d0-eb2b4f77b79b))
+  (fp_circle (center 0 0) (end 10 0) (layer "Dwgs.User") (width 0.2) (fill none) (tstamp 79c89ac7-332b-4c00-b6d3-3069c7256035))
+  (fp_line (start 11.05 -9.8) (end 3.9 -9.8) (layer "F.CrtYd") (width 0.05) (tstamp 325e2d92-f70a-4775-a25d-b1f1d15f9b67))
+  (fp_line (start 11.05 3.05) (end 11.05 6.35) (layer "F.CrtYd") (width 0.05) (tstamp 3d37e17d-9396-4dc6-8d64-d06801a4456e))
+  (fp_line (start -15.85 -3.05) (end -11.05 -3.05) (layer "F.CrtYd") (width 0.05) (tstamp 3e9a56f0-a1c1-4493-aa97-8145cf95e78d))
+  (fp_line (start -11.05 6.35) (end -11.05 3.05) (layer "F.CrtYd") (width 0.05) (tstamp 72967f94-f974-4d8a-9e62-ed5575e78d8e))
+  (fp_line (start -11.05 -9.8) (end -3.9 -9.8) (layer "F.CrtYd") (width 0.05) (tstamp 7d41e779-67c6-4489-9b76-2b4e0f89c6a7))
+  (fp_line (start -11.05 -3.05) (end -11.05 -9.8) (layer "F.CrtYd") (width 0.05) (tstamp 8b57f2f3-4508-4338-9349-f21a016de19d))
+  (fp_line (start 15.85 3.05) (end 11.05 3.05) (layer "F.CrtYd") (width 0.05) (tstamp 8be23523-451f-42f7-bc0a-62fc6bbe08ec))
+  (fp_line (start -15.85 3.05) (end -15.85 -3.05) (layer "F.CrtYd") (width 0.05) (tstamp 90afcaed-ff6f-4065-a999-347ee61fccac))
+  (fp_line (start 11.05 -3.05) (end 15.85 -3.05) (layer "F.CrtYd") (width 0.05) (tstamp a2d73038-d663-4809-9686-8766c741b058))
+  (fp_line (start 11.05 -9.8) (end 11.05 -3.05) (layer "F.CrtYd") (width 0.05) (tstamp b71ea0dd-7c12-43f3-b74d-7a1c6c6bf585))
+  (fp_line (start 11.05 6.35) (end 4.3 11.1) (layer "F.CrtYd") (width 0.05) (tstamp c979caf9-3b3f-44f3-af0b-99dfbe7eb930))
+  (fp_line (start 15.85 -3.05) (end 15.85 3.05) (layer "F.CrtYd") (width 0.05) (tstamp d38a8871-aee3-47f3-a611-d5cfecbfbf47))
+  (fp_line (start -4.3 11.1) (end -11.05 6.35) (layer "F.CrtYd") (width 0.05) (tstamp eb74f2ea-8132-4ed9-8979-709fea612a7c))
+  (fp_line (start 4.3 11.1) (end -4.3 11.1) (layer "F.CrtYd") (width 0.05) (tstamp edc4413c-5931-4d92-8a03-d07744ffc47a))
+  (fp_line (start -11.05 3.05) (end -15.85 3.05) (layer "F.CrtYd") (width 0.05) (tstamp fd09ba11-46a5-4361-9154-dcf635128164))
+  (fp_arc (start -3.9 -9.8) (mid 0 -10.547512) (end 3.9 -9.8) (layer "F.CrtYd") (width 0.05) (tstamp 800dfcfa-0a60-4ff1-a865-7fdc02a1f197))
+  (fp_line (start -15.35 -2.55) (end -10.55 -2.55) (layer "F.Fab") (width 0.1) (tstamp 0858b1fe-dcbe-4d6b-a948-83d38a6709b0))
+  (fp_line (start -10.55 -2.55) (end -10.55 -9.3) (layer "F.Fab") (width 0.1) (tstamp 12b5a5be-920a-4cce-996c-c603cd946bbc))
+  (fp_line (start 10.55 2.55) (end 10.55 5.9) (layer "F.Fab") (width 0.1) (tstamp 33a7cf9b-a958-4056-bbe6-9820b46841ec))
+  (fp_line (start 10.55 2.55) (end 15.35 2.55) (layer "F.Fab") (width 0.1) (tstamp 3f95899a-6241-44b5-ac22-a8b02561c91b))
+  (fp_line (start -3.8 10.6) (end 3.8 10.6) (layer "F.Fab") (width 0.1) (tstamp 49dc13a0-4976-4c28-93ed-7c482399eb18))
+  (fp_line (start -10.55 2.55) (end -10.55 5.85) (layer "F.Fab") (width 0.1) (tstamp 55fb856e-c4ef-4f10-9f93-28ddd7abd6d4))
+  (fp_line (start -15.35 2.55) (end -10.55 2.55) (layer "F.Fab") (width 0.1) (tstamp 66f965ad-589f-4dbf-9129-91904354492b))
+  (fp_line (start -15.35 -2.55) (end -15.35 2.55) (layer "F.Fab") (width 0.1) (tstamp bd215778-6308-464b-9d9d-a5f7dd9bf6da))
+  (fp_line (start 10.55 -2.55) (end 10.55 -9.3) (layer "F.Fab") (width 0.1) (tstamp c693d6c3-faae-43f9-9d5a-4e7f745fab4f))
+  (fp_line (start -10.55 5.85) (end -3.8 10.6) (layer "F.Fab") (width 0.1) (tstamp d1f9754a-a746-421f-b4f6-109038485643))
+  (fp_line (start 10.55 -9.3) (end -10.55 -9.3) (layer "F.Fab") (width 0.1) (tstamp d301289c-0467-43a5-9b19-2c01e75b0037))
+  (fp_line (start 15.35 2.55) (end 15.35 -2.55) (layer "F.Fab") (width 0.1) (tstamp d46488f2-e1c2-4dd8-bafd-8b69b2a8db24))
+  (fp_line (start 15.35 -2.55) (end 10.55 -2.55) (layer "F.Fab") (width 0.1) (tstamp f27694b5-03c1-4a84-86eb-f6a4856076a3))
+  (fp_line (start 10.55 5.9) (end 3.8 10.6) (layer "F.Fab") (width 0.1) (tstamp fb5d4687-44e0-41fa-ad86-1546ce578cee))
+  (pad "1" smd rect (at -12.8 0) (size 5.1 5.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1eb0c7db-0b8a-4a72-a489-e4ee87b8cc62))
+  (pad "1" smd rect (at 12.8 0) (size 5.1 5.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 7b068aab-db77-4c50-ae07-f4973928a439))
+  (pad "2" smd circle (at 0 0) (size 17.8 17.8) (layers "F.Cu" "F.Mask") (tstamp a888fcc8-3365-43ae-8955-1cbfcf0cb1d5))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3002_1x2032.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_3008_1x2450.kicad_mod

@@ -1,70 +1,75 @@
-(module BatteryHolder_Keystone_3008_1x2450 (layer F.Cu) (tedit 5D9CBE11)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=786)
+(footprint "BatteryHolder_Keystone_3008_1x2450" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5D9CBE11)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=786")
   (tags "Keystone type 3008 coin cell retainer")
   (attr smd)
-  (fp_text reference REF** (at 0 -14.4) (layer F.SilkS)
+  (fp_text reference "REF**" (at 0 -14.4) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1413dfb6-482a-4bbc-9db0-5dabf314cbba)
   )
-  (fp_text value BatteryHolder_Keystone_3008_1x2450 (at 0 14) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_3008_1x2450" (at 0 14) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e785a358-ca64-4403-aa8f-2f2b33d108ca)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp b23b2ab2-22ec-4e9f-9270-95abfc19f46e)
   )
-  (fp_arc (start 0 0) (end 0 12.8) (angle -41.7) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 21) (end 9.15 10.05) (angle -3.2) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 0) (end 0 12.8) (angle 41.7) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 21) (end -9.15 10.05) (angle 3.2) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 10.15 9) (end 10.15 10.45) (angle 45) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -10.15 9) (end -10.15 10.45) (angle -45) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 10.15 7.25) (end 10.15 10.45) (angle -90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -10.15 7.25) (end -10.15 10.45) (angle 90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 10.15 9) (end 10.15 9.95) (angle 45) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -10.15 9) (end -10.15 9.95) (angle -45) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 10.15 9) (end 10.15 9.8) (angle 45) (layer F.Fab) (width 0.1))
-  (fp_arc (start -10.15 9) (end -10.15 9.8) (angle -45) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 21) (end -9.6 9.58) (angle 80) (layer F.Fab) (width 0.1))
-  (fp_arc (start -10.15 7.25) (end -10.15 9.95) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 10.15 7.25) (end 10.15 9.95) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_line (start 12.85 3.1) (end 12.85 7.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -12.85 3.1) (end -12.85 7.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.35 3.25) (end 13.35 7.3) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 10.15 7.25) (end 10.15 9.8) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_arc (start -10.15 7.25) (end -10.15 9.8) (angle 90) (layer F.Fab) (width 0.1))
-  (fp_circle (center 0 0) (end 12.25 0) (layer Dwgs.User) (width 0.15))
-  (fp_line (start 4.45 -13.55) (end 4.45 -12.55) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.45 -13.55) (end 4.45 -13.55) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.45 -13.55) (end -4.45 -12.55) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.45 -12.55) (end 13.35 -6.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 13.35 -6.7) (end 13.35 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 18.8 3.25) (end 13.35 3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 18.8 -3.25) (end 18.8 3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 13.35 -3.25) (end 18.8 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.45 -12.55) (end -13.35 -6.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -18.8 -3.25) (end -18.8 3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -18.8 3.25) (end -13.35 3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -13.35 3.25) (end -13.35 7.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -13.35 -3.25) (end -18.8 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -13.35 -6.7) (end -13.35 -3.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 12.85 -6.4) (end 12.85 -3.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.95 -12.25) (end 12.85 -6.4) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.95 -13.05) (end 3.95 -12.25) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.95 -13.05) (end 3.95 -13.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.95 -13.05) (end -3.95 -12.25) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.95 -12.25) (end -12.85 -6.4) (layer F.SilkS) (width 0.12))
-  (fp_line (start -12.85 -6.4) (end -12.85 -3.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 -12.2) (end 12.7 -6.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 12.7 -6.35) (end 12.7 7.3) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.8 -12.2) (end -12.7 -6.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -12.7 -6.35) (end -12.7 7.3) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.8 -12.9) (end -3.8 -12.2) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -12.9) (end 3.8 -12.2) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.8 -12.9) (end 3.8 -12.9) (layer F.Fab) (width 0.1))
-  (pad 1 smd rect (at -15.3 0) (size 6 5.5) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd rect (at 15.3 0) (size 6 5.5) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd circle (at 0 0) (size 20 20) (layers F.Cu F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3008_1x2450.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start 12.85 -6.4) (end 12.85 -3.1) (layer "F.SilkS") (width 0.12) (tstamp 1c2194a7-e797-4fbf-8e85-6d811801cb90))
+  (fp_line (start -3.95 -12.25) (end -12.85 -6.4) (layer "F.SilkS") (width 0.12) (tstamp 35d44202-c650-465e-82dc-d515022a9437))
+  (fp_line (start -12.85 3.1) (end -12.85 7.3) (layer "F.SilkS") (width 0.12) (tstamp 4331657f-6afe-4882-b98d-3b53c45fe13e))
+  (fp_line (start -12.85 -6.4) (end -12.85 -3.1) (layer "F.SilkS") (width 0.12) (tstamp 45600ebf-0c54-4733-a1f5-3c7bf31da53f))
+  (fp_line (start -3.95 -13.05) (end -3.95 -12.25) (layer "F.SilkS") (width 0.12) (tstamp 4e9c2802-c781-418d-9d4e-b92be963307e))
+  (fp_line (start 3.95 -13.05) (end 3.95 -12.25) (layer "F.SilkS") (width 0.12) (tstamp 5f2380c7-bff1-40dd-940c-7bf21eacdc3a))
+  (fp_line (start -3.95 -13.05) (end 3.95 -13.05) (layer "F.SilkS") (width 0.12) (tstamp 7029e42d-4822-48d0-b1b6-b3066e8d8734))
+  (fp_line (start 3.95 -12.25) (end 12.85 -6.4) (layer "F.SilkS") (width 0.12) (tstamp bae46712-f0c5-458f-8747-feb18c7c247a))
+  (fp_line (start 12.85 3.1) (end 12.85 7.3) (layer "F.SilkS") (width 0.12) (tstamp d5bed2a1-dbd7-4a23-a757-cab0cb666471))
+  (fp_arc (start -9.478249 9.671751) (mid -9.786451 9.877685) (end -10.15 9.95) (layer "F.SilkS") (width 0.12) (tstamp 69946e17-a231-4193-8394-501d8a3c0a48))
+  (fp_arc (start 10.15 9.95) (mid 9.786451 9.877686) (end 9.478249 9.671751) (layer "F.SilkS") (width 0.12) (tstamp 6d58314a-710e-474b-a9f1-c3df2a49c88f))
+  (fp_arc (start 12.85 7.25) (mid 12.059188 9.159188) (end 10.15 9.95) (layer "F.SilkS") (width 0.12) (tstamp daf9b1fe-234e-482f-bb6d-a4c55c1d8f6f))
+  (fp_arc (start -10.15 9.95) (mid -12.059188 9.159188) (end -12.85 7.25) (layer "F.SilkS") (width 0.12) (tstamp e4b171ad-1966-42de-8a66-9c93712feb04))
+  (fp_circle (center 0 0) (end 12.25 0) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 8fade2b0-407c-4d19-b65d-71d2e0bbefc3))
+  (fp_line (start -18.8 -3.25) (end -18.8 3.25) (layer "F.CrtYd") (width 0.05) (tstamp 0392cc95-dbe5-49c9-8b6b-79f908c258c6))
+  (fp_line (start 18.8 3.25) (end 13.35 3.25) (layer "F.CrtYd") (width 0.05) (tstamp 41a61167-2bd6-4ec3-a844-45866db86041))
+  (fp_line (start -4.45 -13.55) (end -4.45 -12.55) (layer "F.CrtYd") (width 0.05) (tstamp 43d569d2-46bf-4243-941e-e02da9358400))
+  (fp_line (start 4.45 -13.55) (end 4.45 -12.55) (layer "F.CrtYd") (width 0.05) (tstamp 51526857-1dfa-4e26-89e9-3a4a84f8aa96))
+  (fp_line (start 13.35 3.25) (end 13.35 7.3) (layer "F.CrtYd") (width 0.05) (tstamp 524997ba-7929-4c7f-90bf-684f90b21646))
+  (fp_line (start -13.35 3.25) (end -13.35 7.3) (layer "F.CrtYd") (width 0.05) (tstamp 53b9718d-186a-4079-8555-c7a185b0d98b))
+  (fp_line (start 18.8 -3.25) (end 18.8 3.25) (layer "F.CrtYd") (width 0.05) (tstamp 58d2b8a5-3c31-4ac7-b037-958dfc87b9e8))
+  (fp_line (start -4.45 -13.55) (end 4.45 -13.55) (layer "F.CrtYd") (width 0.05) (tstamp 6543f499-d097-4257-9108-b2444e7ad38b))
+  (fp_line (start -13.35 -6.7) (end -13.35 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp 6b09e247-c33f-4376-ba76-2d1eb4a1e3bf))
+  (fp_line (start -4.45 -12.55) (end -13.35 -6.7) (layer "F.CrtYd") (width 0.05) (tstamp a2f1af17-6bdd-46a9-839e-9251c8f78a12))
+  (fp_line (start -18.8 3.25) (end -13.35 3.25) (layer "F.CrtYd") (width 0.05) (tstamp ac0bf0b4-ebbc-43f7-8d3c-59df0ad8273f))
+  (fp_line (start 13.35 -3.25) (end 18.8 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp cd88b369-3b64-442c-be3b-14573c6c3906))
+  (fp_line (start 4.45 -12.55) (end 13.35 -6.7) (layer "F.CrtYd") (width 0.05) (tstamp ce07f16c-db0e-43a6-ada8-42452bdd3268))
+  (fp_line (start -13.35 -3.25) (end -18.8 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp d092cb43-9f45-4d13-9685-0d870be288f0))
+  (fp_line (start 13.35 -6.7) (end 13.35 -3.25) (layer "F.CrtYd") (width 0.05) (tstamp f252ebf3-5a36-41f4-9659-5f65b70ea0af))
+  (fp_arc (start -9.124695 10.025305) (mid -9.595109 10.339626) (end -10.15 10.45) (layer "F.CrtYd") (width 0.05) (tstamp 01a8661f-47ab-4510-afcf-715c4cf8fb03))
+  (fp_arc (start 13.35 7.25) (mid 12.412742 9.512742) (end 10.15 10.45) (layer "F.CrtYd") (width 0.05) (tstamp 29b62435-8586-49cd-8b0f-2940a744d0e7))
+  (fp_arc (start -10.15 10.45) (mid -12.412742 9.512742) (end -13.35 7.25) (layer "F.CrtYd") (width 0.05) (tstamp 6d57d80b-3f50-4eb3-aa30-5c2429430f10))
+  (fp_arc (start -9.15 10.05) (mid -8.840691 9.798786) (end -8.524488 9.556307) (layer "F.CrtYd") (width 0.05) (tstamp 72871d5f-c0d7-49a7-857b-4d72a2bdaa54))
+  (fp_arc (start 0 12.8) (mid -4.55581 11.961797) (end -8.514949 9.556969) (layer "F.CrtYd") (width 0.05) (tstamp 83787c45-d2fc-422f-9407-f3b3819937af))
+  (fp_arc (start 8.524488 9.556307) (mid 8.840691 9.798786) (end 9.15 10.05) (layer "F.CrtYd") (width 0.05) (tstamp a3695bd6-569c-417b-bc53-fe845b08fa4d))
+  (fp_arc (start 10.15 10.45) (mid 9.595109 10.339625) (end 9.124695 10.025305) (layer "F.CrtYd") (width 0.05) (tstamp d357f608-5886-424e-9f23-f3147b552c4c))
+  (fp_arc (start 8.514949 9.556969) (mid 4.55581 11.961798) (end 0 12.8) (layer "F.CrtYd") (width 0.05) (tstamp f3716fbe-3c2c-4288-a2a9-ed836df403bb))
+  (fp_line (start -3.8 -12.9) (end -3.8 -12.2) (layer "F.Fab") (width 0.1) (tstamp 1843d933-a4df-485b-899e-b1340822efc5))
+  (fp_line (start -3.8 -12.9) (end 3.8 -12.9) (layer "F.Fab") (width 0.1) (tstamp 56f73680-fcd3-4786-bc62-730f170ede3f))
+  (fp_line (start -3.8 -12.2) (end -12.7 -6.35) (layer "F.Fab") (width 0.1) (tstamp 5dc4f61d-330c-4287-a4f5-c458809c123c))
+  (fp_line (start -12.7 -6.35) (end -12.7 7.3) (layer "F.Fab") (width 0.1) (tstamp 60be44ee-d186-45e3-9983-70e416f53393))
+  (fp_line (start 3.8 -12.9) (end 3.8 -12.2) (layer "F.Fab") (width 0.1) (tstamp 6a75114b-0801-4ce7-ba64-7d26906790d7))
+  (fp_line (start 12.7 -6.35) (end 12.7 7.3) (layer "F.Fab") (width 0.1) (tstamp 88baa0a1-c0c0-4684-a008-ca3ea48bae65))
+  (fp_line (start 3.8 -12.2) (end 12.7 -6.35) (layer "F.Fab") (width 0.1) (tstamp 92c681e3-7874-4a68-b6b8-7d09435938e5))
+  (fp_arc (start 10.15 9.8) (mid 9.843853 9.739104) (end 9.584315 9.565685) (layer "F.Fab") (width 0.1) (tstamp 11452214-3cea-4439-a0f6-71df566efc36))
+  (fp_arc (start -10.15 9.8) (mid -11.953122 9.053122) (end -12.7 7.25) (layer "F.Fab") (width 0.1) (tstamp 64145cbe-c0f6-4cd7-9783-70621bf65f91))
+  (fp_arc (start -9.6 9.58) (mid -0.013392 6.081011) (end 9.579482 9.562783) (layer "F.Fab") (width 0.1) (tstamp 7ecd2916-8284-4ade-9892-5b64ee8168bb))
+  (fp_arc (start 12.7 7.25) (mid 11.953122 9.053122) (end 10.15 9.8) (layer "F.Fab") (width 0.1) (tstamp 94dafc8c-9dfe-4b20-b5d5-1d963df25275))
+  (fp_arc (start -9.584315 9.565685) (mid -9.843853 9.739103) (end -10.15 9.8) (layer "F.Fab") (width 0.1) (tstamp ee468150-d2a2-46bd-b791-0a63d9b53337))
+  (pad "1" smd rect (at -15.3 0) (size 6 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 40b73985-8318-44cf-bb01-182754ac2951))
+  (pad "1" smd rect (at 15.3 0) (size 6 5.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 7397bd50-a70e-4340-8993-3d1cd5862981))
+  (pad "2" smd circle (at 0 0) (size 20 20) (layers "F.Cu" "F.Mask") (tstamp 5e322e88-c013-4bf4-a95e-991b067d6245))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3008_1x2450.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )

Battery.pretty/BatteryHolder_Keystone_3009_1x2450.kicad_mod

@@ -1,65 +1,71 @@
-(module BatteryHolder_Keystone_3009_1x2450 (layer F.Cu) (tedit 5D9CBE1C)
-  (descr http://www.keyelco.com/product-pdf.cfm?p=787)
+(footprint "BatteryHolder_Keystone_3009_1x2450" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5D9CBE1C)
+  (descr "http://www.keyelco.com/product-pdf.cfm?p=787")
   (tags "Keystone type 3009 coin cell retainer")
-  (fp_text reference REF** (at 0 -14.4) (layer F.SilkS)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -14.4) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 7a0c729a-d060-4348-9c65-bebc5fe3b686)
   )
-  (fp_text value BatteryHolder_Keystone_3009_1x2450 (at 0 14) (layer F.Fab)
+  (fp_text value "BatteryHolder_Keystone_3009_1x2450" (at 0 14) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 2516b493-0369-45e3-aff3-028660f8a18e)
   )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp e5a545fa-eb0f-404e-922b-f375f7c0b873)
   )
-  (fp_arc (start 0 0) (end 0 12.8) (angle -41.7) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 21) (end 9.15 10.05) (angle -3.2) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 0) (end 0 12.8) (angle 41.7) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 21) (end -9.15 10.05) (angle 3.2) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 10.15 9) (end 10.15 10.45) (angle 45) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -10.15 9) (end -10.15 10.45) (angle -45) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 10.15 7.25) (end 10.15 10.45) (angle -90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -10.15 7.25) (end -10.15 10.45) (angle 90) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 12.7 0) (end 13.35 1.95) (angle -143) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start -12.7 0) (end -13.35 1.95) (angle 143) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 10.15 9) (end 10.15 9.95) (angle 45) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -10.15 9) (end -10.15 9.95) (angle -45) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 10.15 9) (end 10.15 9.8) (angle 45) (layer F.Fab) (width 0.1))
-  (fp_arc (start -10.15 9) (end -10.15 9.8) (angle -45) (layer F.Fab) (width 0.1))
-  (fp_arc (start 0 21) (end -9.6 9.58) (angle 80) (layer F.Fab) (width 0.1))
-  (fp_arc (start -10.15 7.25) (end -10.15 9.95) (angle 90) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 10.15 7.25) (end 10.15 9.95) (angle -90) (layer F.SilkS) (width 0.12))
-  (fp_line (start 12.85 1.9) (end 12.85 7.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -12.85 1.9) (end -12.85 7.3) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 10.15 7.25) (end 10.15 9.8) (angle -90) (layer F.Fab) (width 0.1))
-  (fp_arc (start -10.15 7.25) (end -10.15 9.8) (angle 90) (layer F.Fab) (width 0.1))
-  (fp_circle (center 0 0) (end 12.25 0) (layer Dwgs.User) (width 0.15))
-  (fp_line (start 12.85 -6.4) (end 12.85 -1.9) (layer F.SilkS) (width 0.12))
-  (fp_line (start -12.85 -6.4) (end -12.85 -1.9) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.35 -6.7) (end 13.35 -1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -13.35 1.95) (end -13.35 7.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -13.35 -6.7) (end -13.35 -1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 13.35 1.95) (end 13.35 7.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 12.7 -6.35) (end 12.7 7.3) (layer F.Fab) (width 0.1))
-  (fp_line (start -12.7 -6.35) (end -12.7 7.3) (layer F.Fab) (width 0.1))
-  (fp_line (start 4.45 -13.55) (end 4.45 -12.55) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.45 -13.55) (end 4.45 -13.55) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.45 -13.55) (end -4.45 -12.55) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.45 -12.55) (end 13.35 -6.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.95 -12.25) (end 12.85 -6.4) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.95 -13.05) (end 3.95 -12.25) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.95 -13.05) (end 3.95 -13.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.95 -13.05) (end -3.95 -12.25) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.95 -12.25) (end -12.85 -6.4) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 -12.2) (end 12.7 -6.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.8 -12.2) (end -12.7 -6.35) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.8 -12.9) (end -3.8 -12.2) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -12.9) (end 3.8 -12.2) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.8 -12.9) (end 3.8 -12.9) (layer F.Fab) (width 0.1))
-  (fp_line (start -4.45 -12.55) (end -13.35 -6.7) (layer F.CrtYd) (width 0.05))
-  (pad 1 thru_hole circle (at -12.7 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 12.7 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask))
-  (pad 2 smd circle (at 0 0) (size 20 20) (layers F.Cu F.Mask))
-  (model ${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3009_1x2450.wrl
-    (at (xyz 0 0 0))
+  (fp_line (start -3.95 -13.05) (end 3.95 -13.05) (layer "F.SilkS") (width 0.12) (tstamp 0b8c9e1d-0f81-4bc8-853f-a7968967f892))
+  (fp_line (start -12.85 -6.4) (end -12.85 -1.9) (layer "F.SilkS") (width 0.12) (tstamp 23cca8c6-0cb9-435a-987c-8691ea98fecb))
+  (fp_line (start 3.95 -12.25) (end 12.85 -6.4) (layer "F.SilkS") (width 0.12) (tstamp 49a2fa98-e8ff-4efd-a44b-9d41df240065))
+  (fp_line (start 12.85 -6.4) (end 12.85 -1.9) (layer "F.SilkS") (width 0.12) (tstamp 4dbf062c-65da-4d21-8eba-d3d64c65e5fc))
+  (fp_line (start 3.95 -13.05) (end 3.95 -12.25) (layer "F.SilkS") (width 0.12) (tstamp 89bc47eb-612e-4180-8b24-fe9b7d8bc9f0))
+  (fp_line (start -3.95 -12.25) (end -12.85 -6.4) (layer "F.SilkS") (width 0.12) (tstamp beef446d-0903-4f46-8d0c-a6f2d126fa91))
+  (fp_line (start -12.85 1.9) (end -12.85 7.3) (layer "F.SilkS") (width 0.12) (tstamp cdb2f60a-b6d7-45de-8b16-334c386c15bf))
+  (fp_line (start 12.85 1.9) (end 12.85 7.3) (layer "F.SilkS") (width 0.12) (tstamp f1cb3f73-1225-4ce5-9c3f-3ad6de754a1f))
+  (fp_line (start -3.95 -13.05) (end -3.95 -12.25) (layer "F.SilkS") (width 0.12) (tstamp f7769fd3-15eb-4d02-9eea-6c9698492f81))
+  (fp_arc (start -9.478249 9.671751) (mid -9.786451 9.877685) (end -10.15 9.95) (layer "F.SilkS") (width 0.12) (tstamp 2a756e18-b766-4d48-984f-8c5b25f9a598))
+  (fp_arc (start 12.85 7.25) (mid 12.059188 9.159188) (end 10.15 9.95) (layer "F.SilkS") (width 0.12) (tstamp 849cd5cf-ae5b-48aa-bf29-0df4e1b44bc0))
+  (fp_arc (start 10.15 9.95) (mid 9.786451 9.877686) (end 9.478249 9.671751) (layer "F.SilkS") (width 0.12) (tstamp 97ad299a-271f-47cd-91e5-6ed07559eef6))
+  (fp_arc (start -10.15 9.95) (mid -12.059188 9.159188) (end -12.85 7.25) (layer "F.SilkS") (width 0.12) (tstamp a7ba1cc8-8981-449c-b2bc-34a37005bfac))
+  (fp_circle (center 0 0) (end 12.25 0) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 14bf1648-52bc-4f6b-b682-e2556c635f81))
+  (fp_line (start -13.35 -6.7) (end -13.35 -1.95) (layer "F.CrtYd") (width 0.05) (tstamp 2f272c28-60ae-426a-a960-df433b36fb15))
+  (fp_line (start -4.45 -13.55) (end -4.45 -12.55) (layer "F.CrtYd") (width 0.05) (tstamp 4434d8bb-c5b8-459d-bb32-886c391c7881))
+  (fp_line (start -4.45 -13.55) (end 4.45 -13.55) (layer "F.CrtYd") (width 0.05) (tstamp 512dfa8e-8816-4edf-9cdc-8b7b99fa1402))
+  (fp_line (start 13.35 1.95) (end 13.35 7.3) (layer "F.CrtYd") (width 0.05) (tstamp 55d36568-32b0-40bd-94a1-5af7f3f59268))
+  (fp_line (start 4.45 -13.55) (end 4.45 -12.55) (layer "F.CrtYd") (width 0.05) (tstamp 6169b7af-c26b-4973-ac6e-e78c9430e6c1))
+  (fp_line (start 13.35 -6.7) (end 13.35 -1.95) (layer "F.CrtYd") (width 0.05) (tstamp 6597c953-5b42-428b-8417-2dd30c909a86))
+  (fp_line (start 4.45 -12.55) (end 13.35 -6.7) (layer "F.CrtYd") (width 0.05) (tstamp af970bd0-e34e-4134-bd26-6eaed4114fa0))
+  (fp_line (start -13.35 1.95) (end -13.35 7.3) (layer "F.CrtYd") (width 0.05) (tstamp c0195f52-c22c-4fd9-9748-bb2e07b37c78))
+  (fp_line (start -4.45 -12.55) (end -13.35 -6.7) (layer "F.CrtYd") (width 0.05) (tstamp fe064c40-1906-4f27-ad03-fcdc9721af60))
+  (fp_arc (start 8.514949 9.556969) (mid 4.55581 11.961798) (end 0 12.8) (layer "F.CrtYd") (width 0.05) (tstamp 31f9263a-9fee-4276-be26-116e9865058c))
+  (fp_arc (start 13.354426 -1.948519) (mid 14.755479 0.002334) (end 13.35 1.95) (layer "F.CrtYd") (width 0.05) (tstamp 447f4bdf-fcac-44e0-835f-a681406808d6))
+  (fp_arc (start -10.15 10.45) (mid -12.412742 9.512742) (end -13.35 7.25) (layer "F.CrtYd") (width 0.05) (tstamp 4e2311ea-a55d-48fc-97e1-4afaa2659ff4))
+  (fp_arc (start -9.15 10.05) (mid -8.840691 9.798786) (end -8.524488 9.556307) (layer "F.CrtYd") (width 0.05) (tstamp 637e7eb3-54ad-4aae-81df-19268a2b867b))
+  (fp_arc (start -9.124695 10.025305) (mid -9.595109 10.339626) (end -10.15 10.45) (layer "F.CrtYd") (width 0.05) (tstamp 66aa1c29-31a7-4b59-8ccd-684d4bedef0b))
+  (fp_arc (start 0 12.8) (mid -4.55581 11.961797) (end -8.514949 9.556969) (layer "F.CrtYd") (width 0.05) (tstamp 777a4536-9fe0-4209-8566-3047bd659f41))
+  (fp_arc (start 13.35 7.25) (mid 12.412742 9.512742) (end 10.15 10.45) (layer "F.CrtYd") (width 0.05) (tstamp a74e4ae7-4721-487e-9f17-80239c74a394))
+  (fp_arc (start -13.35 1.95) (mid -14.755479 0.002334) (end -13.354426 -1.948519) (layer "F.CrtYd") (width 0.05) (tstamp ced48917-0d8e-4c24-9c14-8161c5b9fbcc))
+  (fp_arc (start 8.524488 9.556307) (mid 8.840691 9.798786) (end 9.15 10.05) (layer "F.CrtYd") (width 0.05) (tstamp d7a8cb55-3f9c-4149-a292-89704e770782))
+  (fp_arc (start 10.15 10.45) (mid 9.595109 10.339625) (end 9.124695 10.025305) (layer "F.CrtYd") (width 0.05) (tstamp d88dc1b4-a0b5-4f08-8b27-744238abad45))
+  (fp_line (start -3.8 -12.9) (end -3.8 -12.2) (layer "F.Fab") (width 0.1) (tstamp 0242305d-f479-46e6-895c-1469a34a0565))
+  (fp_line (start 12.7 -6.35) (end 12.7 7.3) (layer "F.Fab") (width 0.1) (tstamp 0289a289-3e62-42b3-a54e-08e6df3b0e8b))
+  (fp_line (start 3.8 -12.2) (end 12.7 -6.35) (layer "F.Fab") (width 0.1) (tstamp 2d5f0cab-1f81-4176-8e2f-d5a716775e59))
+  (fp_line (start 3.8 -12.9) (end 3.8 -12.2) (layer "F.Fab") (width 0.1) (tstamp 3815401b-59a4-4e86-b792-cd981488d3ef))
+  (fp_line (start -3.8 -12.2) (end -12.7 -6.35) (layer "F.Fab") (width 0.1) (tstamp 803d1240-0d8e-45f4-8c24-31c9dc71f253))
+  (fp_line (start -12.7 -6.35) (end -12.7 7.3) (layer "F.Fab") (width 0.1) (tstamp 98add012-4e29-4318-8bfd-1e09e949192b))
+  (fp_line (start -3.8 -12.9) (end 3.8 -12.9) (layer "F.Fab") (width 0.1) (tstamp f2be96c0-89aa-4fad-b51b-3e8c5b1e10b4))
+  (fp_arc (start 10.15 9.8) (mid 9.843853 9.739104) (end 9.584315 9.565685) (layer "F.Fab") (width 0.1) (tstamp 58649afd-fa43-4503-9a62-d51cd1cf6e30))
+  (fp_arc (start 12.7 7.25) (mid 11.953122 9.053122) (end 10.15 9.8) (layer "F.Fab") (width 0.1) (tstamp 752dac6a-56fb-4ad7-ae13-8df90d60ec70))
+  (fp_arc (start -10.15 9.8) (mid -11.953122 9.053122) (end -12.7 7.25) (layer "F.Fab") (width 0.1) (tstamp 9f2520f4-1ab3-43c6-894e-744398c9b983))
+  (fp_arc (start -9.584315 9.565685) (mid -9.843853 9.739103) (end -10.15 9.8) (layer "F.Fab") (width 0.1) (tstamp aa1cb929-b9b7-4404-9b1c-ad785c378d9e))
+  (fp_arc (start -9.6 9.58) (mid -0.013392 6.081011) (end 9.579482 9.562783) (layer "F.Fab") (width 0.1) (tstamp c7117efe-df9d-448c-96bb-a9810f1c2458))
+  (pad "1" thru_hole circle (at 12.7 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask) (tstamp 77469923-d298-4f3a-bc14-a59eca75a1b3))
+  (pad "1" thru_hole circle (at -12.7 0) (size 3 3) (drill 1.9) (layers *.Cu *.Mask) (tstamp f00068ed-1132-478f-a18f-6ec12e24647d))
+  (pad "2" smd circle (at 0 0) (size 20 20) (layers "F.Cu" "F.Mask") (tstamp 65fcd214-da6d-4e22-a73b-1c0427be6d6c))
+  (model "${KICAD6_3DMODEL_DIR}/Battery.3dshapes/BatteryHolder_Keystone_3009_1x2450.wrl"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )