Merge branch 'master' into custom-pad-zone

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,3 +11,8 @@ Thanks for creating a pull request to contribute to the KiCad libraries! To spee
 - [ ] If there are matching symbol or 3D model pull requests, provide link(s) as appropriate
 - [ ] Check the output of the Travis automated check scripts - fix any errors as required
 - [ ] Give a reason behind any intentional library convention rule violation.
+
+---
+
+Be patient, we maintainers are volunteers with limited time and need to check your contribution against the datasheet. You can speed up the process by providing all the necessary information (see above). And you can speed up the process even more by providing a dimensioned drawing of your contribution. A tutorial on how to do that is found here: https://forum.kicad.info/t/how-to-check-footprint-correctness/9279 (This is optional!)
+

Battery.pretty/BatteryHolder_ComfortableElectronic_CH273-2450_1x2450.kicad_mod

@@ -0,0 +1,32 @@
+(module "BatteryHolder_ComfortableElectronic_CH273-2450_1x2450" (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)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value "BatteryHolder_ComfortableElectronic_CH273-2450_1x2450" (at 13.47 2.54) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user "%R" (at 14 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.1)))
+  )
+  (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))
+  (model "${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_ComfortableElectronic_CH273-2450_1x2450.wrl"
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Battery.pretty/BatteryHolder_Keystone_2460_1xAA.kicad_mod

@@ -0,0 +1,56 @@
+(module BatteryHolder_Keystone_2460_1xAA (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)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value BatteryHolder_Keystone_2460_1xAA (at 24.5 0 180) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (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)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (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)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user + (at -3.4 -0.06) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (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 ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_2460_1xAA.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Battery.pretty/BatteryHolder_Keystone_2479_3xAAA.kicad_mod

@@ -1,139 +1,40 @@
-(module BatteryHolder_Keystone_2479_3xAAA (layer F.Cu) (tedit 5B254C90)
-  (descr "3xAAA cell battery holder, Keystone P/N 2479, http://www.keyelco.com/product-pdf.cfm?p=1041")
-  (tags "AAA battery cell holder")
-  (fp_text reference REF** (at 0 -7 180) (layer F.SilkS)
+(module BatteryHolder_Keystone_2479_3xAAA (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)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value BatteryHolder_Keystone_2479_3xAAA (at 25.4 8.89) (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)))
   )
-  (fp_text user + (at 12.7 0) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user %R (at 0 0) (layer F.Fab)
+  (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_line (start 50.5 31.65) (end 50.5 -6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.7 31.65) (end 50.5 31.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.7 -6.05) (end -2.7 31.65) (layer F.SilkS) (width 0.12))
-  (fp_line (start 50.5 -6.05) (end -2.7 -6.05) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.1 -6.45) (end 50.9 -6.45) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.1 32.05) (end -3.1 -6.45) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 50.9 32.05) (end -3.1 32.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 50.9 -6.45) (end 50.9 32.05) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 25.4 18.034) (end 48.26 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 25.4 17.526) (end 25.4 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 48.26 17.526) (end 25.4 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start 21.59 18.034) (end -1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 21.59 17.526) (end 21.59 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.27 17.526) (end 21.59 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.766 20.955) (end 32.766 22.225) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 20.955) (end 32.766 20.955) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 22.225) (end 14.986 20.955) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.716 22.225) (end 14.986 22.225) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.716 24.765) (end 13.716 22.225) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 24.765) (end 13.716 24.765) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 26.035) (end 14.986 24.765) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.766 26.035) (end 14.986 26.035) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.766 22.225) (end 32.766 26.035) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.766 22.225) (end 32.766 26.035) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.766 26.035) (end 14.986 26.035) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 26.035) (end 14.986 24.765) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 24.765) (end 13.716 24.765) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.716 24.765) (end 13.716 22.225) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.716 22.225) (end 14.986 22.225) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 22.225) (end 14.986 20.955) (layer F.SilkS) (width 0.12))
-  (fp_line (start 14.986 20.955) (end 32.766 20.955) (layer F.SilkS) (width 0.12))
-  (fp_line (start 32.766 20.955) (end 32.766 22.225) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 -2.54) (end 33.02 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 15.24 -2.54) (end 33.02 -2.54) (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 13.97 -1.27) (end 15.24 -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 15.24 1.27) (end 13.97 1.27) (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 33.02 2.54) (end 15.24 2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 -1.27) (end 33.02 2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.27 17.78) (end -1.27 30.6705) (layer F.SilkS) (width 0.12))
-  (fp_line (start 48.26 17.78) (end 48.26 30.68) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.6 18.65) (end -2.6 31.55) (layer F.Fab) (width 0.1))
-  (fp_line (start 50.4 18.65) (end 50.4 31.55) (layer F.Fab) (width 0.1))
-  (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 31.75 10.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start 31.75 10.16) (end 31.75 11.43) (layer F.SilkS) (width 0.12))
-  (fp_line (start 31.75 11.43) (end 33.02 11.43) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 11.43) (end 33.02 13.97) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 13.97) (end 31.75 13.97) (layer F.SilkS) (width 0.12))
-  (fp_line (start 31.75 13.97) (end 31.75 15.24) (layer F.SilkS) (width 0.12))
-  (fp_line (start 31.75 15.24) (end 13.97 15.24) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 -1.27) (end 33.02 2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 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.02 -2.54) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 -2.54) (end 33.02 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.27 6.096) (end 21.59 6.096) (layer F.SilkS) (width 0.12))
-  (fp_line (start 21.59 6.096) (end 21.59 6.604) (layer F.SilkS) (width 0.12))
-  (fp_line (start 21.59 6.604) (end -1.27 6.604) (layer F.SilkS) (width 0.12))
-  (fp_line (start 48.26 6.096) (end 25.4 6.096) (layer F.SilkS) (width 0.12))
-  (fp_line (start 25.4 6.096) (end 25.4 6.604) (layer F.SilkS) (width 0.12))
-  (fp_line (start 25.4 6.604) (end 48.26 6.604) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 29.41) (end 13.97 30.68) (layer F.SilkS) (width 0.12))
-  (fp_line (start 13.97 30.68) (end 33.02 30.68) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 30.68) (end 33.02 29.41) (layer F.SilkS) (width 0.12))
-  (fp_line (start 45.72 -3.81) (end 33.02 -3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 -3.81) (end 33.02 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_line (start 33.02 -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 45.72 29.41) (end 33.02 29.41) (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 30.6705) (end 1.27 30.6705) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.27 30.6705) (end 1.27 29.41) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.27 29.41) (end 13.97 29.41) (layer F.SilkS) (width 0.12))
-  (fp_line (start 48.26 -5.08) (end 45.72 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_line (start 45.72 -5.08) (end 45.72 -3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 48.26 -5.08) (end 48.26 17.78) (layer F.SilkS) (width 0.12))
-  (fp_line (start 48.26 30.68) (end 45.72 30.68) (layer F.SilkS) (width 0.12))
-  (fp_line (start 45.72 30.68) (end 45.72 29.41) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.6 18.65) (end -2.6 6.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 50.4 18.65) (end 50.4 -5.95) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.6 31.55) (end 50.4 31.55) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.6 6.35) (end -2.6 -5.95) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.6 -5.95) (end 50.4 -5.95) (layer F.Fab) (width 0.1))
-  (fp_text user + (at 34.29 12.7) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
+  (fp_text user + (at -4.5 0.05) (layer F.SilkS)
+    (effects (font (size 3 3) (thickness 0.15)))
   )
-  (fp_text user + (at 12.7 23.495) (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 34.29 23.495) (layer F.SilkS)
-    (effects (font (size 1.5 1.5) (thickness 0.15)))
-  )
-  (fp_text user - (at 34.29 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 -3.81 0) (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 23.7236 23.495) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 23.7236 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_2479_3xAAA.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )
-)
+)

Battery.pretty/BatteryHolder_Keystone_2998_1x6.8mm.kicad_mod

@@ -0,0 +1,43 @@
+(module BatteryHolder_Keystone_2998_1x6.8mm (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)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value BatteryHolder_Keystone_2998_1x6.8mm (at 0 5.725) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (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)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (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 ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_2998_1x6.8mm.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Battery.pretty/BatteryHolder_Keystone_3000_1x12mm.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_Keystone_3000_1x12mm (layer F.Cu) (tedit 58972371)
+(module BatteryHolder_Keystone_3000_1x12mm (layer F.Cu) (tedit 5D9CBDF8)
   (descr http://www.keyelco.com/product-pdf.cfm?p=777)
   (tags "Keystone type 3000 coin cell retainer")
   (attr smd)
@@ -11,28 +11,21 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (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 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 0 8.9) (end -4.5 5.2) (angle 101) (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.10))
-  (fp_arc (start -5.29 4.6) (end -4.6 5.1) (angle 60) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0 8.9) (end -4.6 5.1) (angle 101) (layer F.Fab) (width 0.10))
-  (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.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.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.25 2.15) (end 7.25 4.1) (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 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.10))
+  (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))
@@ -53,17 +46,18 @@
   (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.10))
-  (fp_line (start 6.6 -3.4) (end 6.6 4.1) (layer F.Fab) (width 0.10))
-  (fp_line (start -6.6 -3.4) (end -6.6 4.1) (layer F.Fab) (width 0.10))
-  (fp_line (start 4 -6) (end 6.6 -3.4) (layer F.Fab) (width 0.10))
-  (fp_line (start -4 -6) (end -6.6 -3.4) (layer F.Fab) (width 0.10))
-  (fp_line (start 4 -6.7) (end 4 -6) (layer F.Fab) (width 0.10))
-  (fp_line (start -4 -6.7) (end -4 -6) (layer F.Fab) (width 0.10))
-  (fp_line (start -4 -6.7) (end 4 -6.7) (layer F.Fab) (width 0.10))
+  (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 rect (at 0 0) (size 4 4) (layers F.Cu F.Mask))
+  (pad 2 smd circle (at 0 0) (size 10.2 10.2) (layers F.Cu F.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_3000_1x12mm.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))

Battery.pretty/BatteryHolder_Keystone_3001_1x12mm.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_Keystone_3001_1x12mm (layer F.Cu) (tedit 58972363)
+(module BatteryHolder_Keystone_3001_1x12mm (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)
@@ -22,10 +22,9 @@
   (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 0 8.9) (end -4.5 5.2) (angle 101) (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.10))
-  (fp_arc (start -5.29 4.6) (end -4.6 5.1) (angle 60) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0 8.9) (end -4.6 5.1) (angle 101) (layer F.Fab) (width 0.10))
+  (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))
@@ -33,7 +32,7 @@
   (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.10))
+  (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))
@@ -48,17 +47,17 @@
   (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.10))
-  (fp_line (start 6.6 -3.4) (end 6.6 4.1) (layer F.Fab) (width 0.10))
-  (fp_line (start -6.6 -3.4) (end -6.6 4.1) (layer F.Fab) (width 0.10))
-  (fp_line (start 4 -6) (end 6.6 -3.4) (layer F.Fab) (width 0.10))
-  (fp_line (start -4 -6) (end -6.6 -3.4) (layer F.Fab) (width 0.10))
-  (fp_line (start 4 -6.7) (end 4 -6) (layer F.Fab) (width 0.10))
-  (fp_line (start -4 -6.7) (end -4 -6) (layer F.Fab) (width 0.10))
-  (fp_line (start -4 -6.7) (end 4 -6.7) (layer F.Fab) (width 0.10))
+  (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 rect (at 0 0) (size 4 4) (layers F.Cu F.Mask))
+  (pad 2 smd circle (at 0 0) (size 9 9) (layers F.Cu F.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_3001_1x12mm.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))

Battery.pretty/BatteryHolder_Keystone_3002_1x2032.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_Keystone_3002_1x2032 (layer F.Cu) (tedit 5CBDF5E8)
+(module BatteryHolder_Keystone_3002_1x2032 (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)
@@ -56,7 +56,7 @@
   (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 12 12) (layers F.Cu F.Mask))
+  (pad 2 smd circle (at 0 0) (size 17.8 17.8) (layers F.Cu F.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_3002_1x2032.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))

Battery.pretty/BatteryHolder_Keystone_3008_1x2450.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_Keystone_3008_1x2450 (layer F.Cu) (tedit 58972352)
+(module BatteryHolder_Keystone_3008_1x2450 (layer F.Cu) (tedit 5D9CBE11)
   (descr http://www.keyelco.com/product-pdf.cfm?p=786)
   (tags "Keystone type 3008 coin cell retainer")
   (attr smd)
@@ -19,19 +19,18 @@
   (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 0 21) (end -9.55 9.73) (angle 80) (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.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.10))
-  (fp_arc (start -10.15 9) (end -10.15 9.8) (angle -45) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0 21) (end -9.6 9.58) (angle 80) (layer F.Fab) (width 0.10))
+  (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.10))
-  (fp_arc (start -10.15 7.25) (end -10.15 9.8) (angle 90) (layer F.Fab) (width 0.10))
+  (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))
@@ -54,16 +53,16 @@
   (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.10))
-  (fp_line (start 12.7 -6.35) (end 12.7 7.3) (layer F.Fab) (width 0.10))
-  (fp_line (start -3.8 -12.2) (end -12.7 -6.35) (layer F.Fab) (width 0.10))
-  (fp_line (start -12.7 -6.35) (end -12.7 7.3) (layer F.Fab) (width 0.10))
-  (fp_line (start -3.8 -12.9) (end -3.8 -12.2) (layer F.Fab) (width 0.10))
-  (fp_line (start 3.8 -12.9) (end 3.8 -12.2) (layer F.Fab) (width 0.10))
-  (fp_line (start -3.8 -12.9) (end 3.8 -12.9) (layer F.Fab) (width 0.10))
+  (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 rect (at 0 0) (size 8 8) (layers F.Cu F.Mask))
+  (pad 2 smd circle (at 0 0) (size 20 20) (layers F.Cu F.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_3008_1x2450.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))

Battery.pretty/BatteryHolder_Keystone_3009_1x2450.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_Keystone_3009_1x2450 (layer F.Cu) (tedit 58972349)
+(module BatteryHolder_Keystone_3009_1x2450 (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)
@@ -20,18 +20,17 @@
   (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 0 21) (end -9.55 9.73) (angle 80) (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.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.10))
-  (fp_arc (start -10.15 9) (end -10.15 9.8) (angle -45) (layer F.Fab) (width 0.10))
-  (fp_arc (start 0 21) (end -9.6 9.58) (angle 80) (layer F.Fab) (width 0.10))
+  (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.10))
-  (fp_arc (start -10.15 7.25) (end -10.15 9.8) (angle 90) (layer F.Fab) (width 0.10))
+  (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))
@@ -39,8 +38,8 @@
   (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.10))
-  (fp_line (start -12.7 -6.35) (end -12.7 7.3) (layer F.Fab) (width 0.10))
+  (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))
@@ -50,15 +49,15 @@
   (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.10))
-  (fp_line (start -3.8 -12.2) (end -12.7 -6.35) (layer F.Fab) (width 0.10))
-  (fp_line (start -3.8 -12.9) (end -3.8 -12.2) (layer F.Fab) (width 0.10))
-  (fp_line (start 3.8 -12.9) (end 3.8 -12.2) (layer F.Fab) (width 0.10))
-  (fp_line (start -3.8 -12.9) (end 3.8 -12.9) (layer F.Fab) (width 0.10))
+  (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 rect (at 0 0) (size 8 8) (layers F.Cu F.Mask))
+  (pad 2 smd circle (at 0 0) (size 20 20) (layers F.Cu F.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_3009_1x2450.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))

Battery.pretty/BatteryHolder_Keystone_3034_1x20mm.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_Keystone_3034_1x20mm (layer F.Cu) (tedit 595D9565)
+(module BatteryHolder_Keystone_3034_1x20mm (layer F.Cu) (tedit 5D9CBF18)
   (descr "Keystone 3034 SMD battery holder for 2020, 2025 and 2032 coincell batteries. http://www.keyelco.com/product-pdf.cfm?p=798")
   (tags "Keystone type 3034 coin cell retainer")
   (attr smd)
@@ -12,18 +12,17 @@
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_circle (center 0 0) (end 0 10.25) (layer Dwgs.User) (width 0.15))
-  (fp_arc (start 0 16.36) (end 6 8.55) (angle -75.1) (layer F.SilkS) (width 0.1))
-  (fp_arc (start -7.31 6.85) (end -9.34 7.58) (angle -107.5) (layer F.SilkS) (width 0.1))
-  (fp_line (start -10.78 3.63) (end -9.34 7.58) (layer F.SilkS) (width 0.1))
-  (fp_line (start -8.7 -7.54) (end -10.78 -5.46) (layer F.SilkS) (width 0.1))
-  (fp_line (start 8.7 -7.54) (end -8.7 -7.54) (layer F.SilkS) (width 0.1))
-  (fp_line (start 8.7 -7.54) (end 10.78 -5.46) (layer F.SilkS) (width 0.1))
-  (fp_line (start 10.78 3.63) (end 9.34 7.58) (layer F.SilkS) (width 0.1))
-  (fp_arc (start 7.31 6.85) (end 6 8.55) (angle -107.5) (layer F.SilkS) (width 0.1))
-  (fp_line (start -10.78 -5.46) (end -10.78 -3) (layer F.SilkS) (width 0.1))
-  (fp_line (start -10.78 3) (end -10.78 3.63) (layer F.SilkS) (width 0.1))
-  (fp_line (start 10.78 -5.46) (end 10.78 -3) (layer F.SilkS) (width 0.1))
-  (fp_line (start 10.78 3) (end 10.78 3.63) (layer F.SilkS) (width 0.1))
+  (fp_arc (start -7.31 6.85) (end -9.34 7.58) (angle -107.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -10.78 3.63) (end -9.34 7.58) (layer F.SilkS) (width 0.12))
+  (fp_line (start -8.7 -7.54) (end -10.78 -5.46) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.2 -7.54) (end -8.7 -7.54) (layer F.SilkS) (width 0.12))
+  (fp_line (start 8.7 -7.54) (end 10.78 -5.46) (layer F.SilkS) (width 0.12))
+  (fp_line (start 10.78 3.63) (end 9.34 7.58) (layer F.SilkS) (width 0.12))
+  (fp_arc (start 7.31 6.85) (end 6 8.55) (angle -107.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -10.78 -5.46) (end -10.78 -3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -10.78 3) (end -10.78 3.63) (layer F.SilkS) (width 0.12))
+  (fp_line (start 10.78 -5.46) (end 10.78 -3) (layer F.SilkS) (width 0.12))
+  (fp_line (start 10.78 3) (end 10.78 3.63) (layer F.SilkS) (width 0.12))
   (fp_line (start -9.19 7.53) (end -10.63 3.6) (layer F.Fab) (width 0.1))
   (fp_line (start -10.63 3.6) (end -10.63 -5.4) (layer F.Fab) (width 0.1))
   (fp_line (start -10.63 -5.4) (end -8.64 -7.39) (layer F.Fab) (width 0.1))
@@ -54,7 +53,8 @@
   (fp_line (start 10.88 3.64) (end 10.88 2.79) (layer F.CrtYd) (width 0.05))
   (fp_line (start 10.88 2.79) (end 11.87 2.79) (layer F.CrtYd) (width 0.05))
   (fp_line (start 11.87 2.79) (end 11.87 -2.79) (layer F.CrtYd) (width 0.05))
-  (pad 2 smd rect (at 0 0) (size 3.96 3.96) (layers F.Cu F.Paste F.Mask))
+  (fp_line (start 8.7 -7.54) (end 5.2 -7.54) (layer F.SilkS) (width 0.12))
+  (pad 2 smd circle (at 0 0) (size 17.8 17.8) (layers F.Cu F.Mask))
   (pad 1 smd rect (at 10.985 0) (size 1.27 5.08) (layers F.Cu F.Paste F.Mask))
   (pad 1 smd rect (at -10.985 0) (size 1.27 5.08) (layers F.Cu F.Paste F.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_3034_1x20mm.wrl

Battery.pretty/BatteryHolder_LINX_BAT-HLD-012-SMT.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_LINX_BAT-HLD-012-SMT (layer F.Cu) (tedit 5B256044)
+(module BatteryHolder_LINX_BAT-HLD-012-SMT (layer F.Cu) (tedit 5D9C8191)
   (descr "SMT battery holder for CR1216/1220/1225, https://linxtechnologies.com/wp/wp-content/uploads/bat-hld-012-smt.pdf")
   (tags "battery holder coin cell cr1216 cr1220 cr1225")
   (attr smd)
@@ -8,12 +8,12 @@
   (fp_text value BatteryHolder_LINX_BAT-HLD-012-SMT (at 0 -7) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 6.55 2.85) (end 5.4 4.2) (layer F.SilkS) (width 0.1))
-  (fp_line (start -6.55 2.85) (end -5.4 4.2) (layer F.SilkS) (width 0.1))
-  (fp_line (start -4.9 -4.4) (end -3 -4.4) (layer F.SilkS) (width 0.1))
-  (fp_line (start 4.9 -4.4) (end 3 -4.4) (layer F.SilkS) (width 0.1))
-  (fp_line (start 4.9 -4.4) (end 6.55 -2.75) (layer F.SilkS) (width 0.1))
-  (fp_line (start -6.55 -2.75) (end -4.9 -4.4) (layer F.SilkS) (width 0.1))
+  (fp_line (start 6.55 2.85) (end 5.4 4.2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -6.55 2.85) (end -5.4 4.2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.9 -4.4) (end -3 -4.4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 4.9 -4.4) (end 3 -4.4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 4.9 -4.4) (end 6.55 -2.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -6.55 -2.75) (end -4.9 -4.4) (layer F.SilkS) (width 0.12))
   (fp_line (start 6.55 -2.75) (end 6.75 -2.75) (layer F.Fab) (width 0.1))
   (fp_line (start 6.55 -2.75) (end 6.7 -2.9) (layer F.Fab) (width 0.1))
   (fp_line (start 5.05 -4.55) (end 4.9 -4.4) (layer F.Fab) (width 0.1))
@@ -36,7 +36,7 @@
   (fp_line (start -9.35 3.05) (end -9.35 -3.05) (layer F.CrtYd) (width 0.05))
   (fp_circle (center 0 0) (end -6.25 0) (layer F.Fab) (width 0.1))
   (fp_arc (start 0 6) (end -1.8 4.2) (angle 90) (layer F.Fab) (width 0.1))
-  (fp_arc (start 3.6 2.4) (end 5.4 4.2) (angle 70.55996517) (layer F.SilkS) (width 0.1))
+  (fp_arc (start 3.6 2.4) (end 5.4 4.2) (angle 70.55996517) (layer F.SilkS) (width 0.12))
   (fp_line (start 6.55 2.85) (end 5.4 4.2) (layer F.Fab) (width 0.1))
   (fp_line (start -6.55 2.85) (end -5.4 4.2) (layer F.Fab) (width 0.1))
   (fp_line (start -6.55 -2.75) (end -4.9 -4.4) (layer F.Fab) (width 0.1))
@@ -65,10 +65,10 @@
   )
   (fp_arc (start 3.6 2.4) (end 5.4 4.2) (angle 90) (layer F.Fab) (width 0.1))
   (fp_arc (start -3.6 2.4) (end -1.8 4.2) (angle 90) (layer F.Fab) (width 0.1))
-  (fp_arc (start -3.6 2.4) (end -5.4 4.2) (angle -70.5) (layer F.SilkS) (width 0.1))
+  (fp_arc (start -3.6 2.4) (end -5.4 4.2) (angle -70.5) (layer F.SilkS) (width 0.12))
   (pad 1 smd rect (at -7.6 0) (size 2.5 5.1) (layers F.Cu F.Paste F.Mask))
   (pad 1 smd rect (at 7.6 0) (size 2.5 5.1) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd circle (at 0 0) (size 10.2 10.2) (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 ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_LINX_BAT-HLD-012-SMT.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))

Battery.pretty/BatteryHolder_MPD_BA9VPC_1xPP3.kicad_mod

@@ -0,0 +1,55 @@
+(module BatteryHolder_MPD_BA9VPC_1xPP3 (layer F.Cu) (tedit 5E3B46E0)
+  (descr "1xPP3 (9V) battery holder, Memory Protection Devices P/N BA9VPC, http://www.memoryprotectiondevices.com/datasheets/BA9VPC-datasheet.pdf")
+  (tags "PP3 Battery Holder BA9VPC 9V")
+  (fp_text reference REF** (at 0 -7.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value BatteryHolder_MPD_BA9VPC_1xPP3 (at 25.75 23.6) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 53.49 22.67) (end 53.49 -9.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.45 -9.7) (end -2.45 22.67) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.45 22.67) (end 53.49 22.67) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.45 -9.7) (end 53.49 -9.7) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 25.75 6.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user - (at 3.6 12.88) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)) (justify left))
+  )
+  (fp_text user + (at 3.6 0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)) (justify left))
+  )
+  (fp_line (start 3.65 22.17) (end 3.65 19.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.65 19.27) (end -1.95 19.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.65 -5.1) (end 3.65 -9.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.65 -5.1) (end -1.95 -5.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.65 -9.2) (end 52.99 -9.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.65 22.17) (end 52.99 22.17) (layer F.Fab) (width 0.1))
+  (fp_line (start 52.99 22.17) (end 52.99 -9.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.95 19.27) (end -1.95 -5.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 53.1 22.28) (end 53.1 -9.31) (layer F.SilkS) (width 0.12))
+  (fp_line (start 53.1 22.28) (end 3.54 22.28) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.54 22.28) (end 3.54 19.38) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.54 19.38) (end -2.06 19.38) (layer F.SilkS) (width 0.12))
+  (fp_line (start 53.1 -9.31) (end 3.54 -9.31) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.54 -9.31) (end 3.54 -5.21) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.54 -5.21) (end -2.06 -5.21) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.06 -5.21) (end -2.06 -2.65) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.06 2.65) (end -2.06 11) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.06 19.38) (end -2.06 14.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.4 -5.55) (end -2.4 -2.55) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.4 -5.55) (end 0.6 -5.55) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.5 0) (end -1.95 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.95 0.45) (end -1.5 0) (layer F.Fab) (width 0.1))
+  (pad 1 thru_hole rect (at 0 0) (size 2.41 4.02) (drill oval 0.66 2.27) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 12.88) (size 2.41 4.02) (drill oval 0.66 2.27) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 25.78 -4.73) (size 2.3 2.3) (drill 2.29) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 12.29 17.62) (size 2.3 2.3) (drill 2.29) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 39.26 17.62) (size 2.3 2.3) (drill 2.29) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_MPD_BA9VPC_1xPP3.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Battery.pretty/BatteryHolder_MPD_BC2003_1x2032.kicad_mod

@@ -1,4 +1,4 @@
-(module BatteryHolder_MPD_BC2003_1x2032 (layer F.Cu) (tedit 5AED2918)
+(module BatteryHolder_MPD_BC2003_1x2032 (layer F.Cu) (tedit 5D9C8106)
   (descr http://www.memoryprotectiondevices.com/datasheets/BC-2003-datasheet.pdf)
   (tags "BC2003 CR2032 2032 Battery Holder")
   (attr smd)
@@ -51,7 +51,7 @@
   (fp_arc (start 0 0) (end -8.94 5.01) (angle -121.3) (layer F.CrtYd) (width 0.05))
   (fp_arc (start 0 0) (end 8.86291 -4.885) (angle -122.2752329) (layer F.SilkS) (width 0.12))
   (fp_arc (start 0 0) (end -8.86291 4.885) (angle -122.3) (layer F.SilkS) (width 0.12))
-  (pad 2 smd rect (at 0 0) (size 8 5.56) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd circle (at 0 0) (size 17.8 17.8) (layers F.Cu F.Mask))
   (pad 1 smd rect (at 11.905 0) (size 2.6 5.56) (layers F.Cu F.Paste F.Mask))
   (pad 1 smd rect (at -11.905 0) (size 2.6 5.56) (layers F.Cu F.Paste F.Mask))
   (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_MPD_BC2003_1x2032.wrl

Button_Switch_SMD.pretty/SW_DPDT_CK_JS202011JCQN.kicad_mod

@@ -0,0 +1,48 @@
+(module SW_DPDT_CK_JS202011JCQN (layer F.Cu) (tedit 5E695155)
+  (descr "Sub-miniature slide switch, vertical, SMT J bend https://dznh3ojzb2azq.cloudfront.net/products/Slide/JS/documents/datasheet.pdf")
+  (tags "switch DPDT SMT")
+  (attr smd)
+  (fp_text reference REF** (at 0 -3.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value SW_DPDT_CK_JS202011JCQN (at 0 3.15) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -4.5 -1.8) (end 4.5 -1.8) (layer F.Fab) (width 0.1))
+  (fp_line (start 4.5 -1.8) (end 4.5 1.8) (layer F.Fab) (width 0.1))
+  (fp_line (start 4.5 1.8) (end -4.5 1.8) (layer F.Fab) (width 0.1))
+  (fp_line (start -4.5 1.8) (end -4.5 -1.8) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 -3.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 4.61 -1.91) (end 4.61 1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.26 -1.91) (end -4.61 -1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.61 -1.91) (end -4.61 1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.61 1.91) (end -3.26 1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.76 -1.91) (end -1.74 -1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start 4.61 -1.91) (end 3.26 -1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start 4.61 1.91) (end 3.26 1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.74 -1.91) (end 0.76 -1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.76 1.91) (end -1.74 1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.74 1.91) (end 0.76 1.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.75 -0.75) (end 1.75 -0.75) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.75 -0.75) (end 1.75 0.75) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.75 0.75) (end -1.75 0.75) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.75 -0.75) (end -1.75 0.75) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.25 -0.75) (end -0.25 0.75) (layer F.Fab) (width 0.1))
+  (fp_line (start 4.75 -2.25) (end 4.75 2.25) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -4.75 -2.25) (end -4.75 2.25) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -4.75 -2.25) (end 4.75 -2.25) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 4.75 2.25) (end -4.75 2.25) (layer F.CrtYd) (width 0.05))
+  (pad 4 smd rect (at -2.5 1.2) (size 1 1.6) (layers F.Cu F.Paste F.Mask))
+  (pad 5 smd rect (at 0 1.2) (size 1 1.6) (layers F.Cu F.Paste F.Mask))
+  (pad 6 smd rect (at 2.5 1.2) (size 1 1.6) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -2.5 -1.2) (size 1 1.6) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 0 -1.2) (size 1 1.6) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 2.5 -1.2) (size 1 1.6) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_DPDT_CK_JS202011JCQN.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Button_Switch_SMD.pretty/SW_Push_1P1T-MP_NO_Horizontal_Alps_SKRTLAE010.kicad_mod

@@ -0,0 +1,50 @@
+(module SW_Push_1P1T-MP_NO_Horizontal_Alps_SKRTLAE010 (layer F.Cu) (tedit 5D96FB7F)
+  (descr "Side push button (https://www.alps.com/prod/info/E/PDF/Tact/SurfaceMount/SKRT/SKRT.pdf)")
+  (tags "push horizontal SPST 1P1T")
+  (attr smd)
+  (fp_text reference REF** (at 0 -2.7 180) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value SW_Push_1P1T-MP_NO_Horizontal_Alps_SKRTLAE010 (at 0 2.9) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.25 1.21) (end 2.25 1.21) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.25 -1.35) (end 2.25 -1.35) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 -1.35) (end 2.25 1.21) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.25 -1.35) (end -2.25 1.21) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 2.04) (end 1 2.04) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 2.04) (end 1 1.21) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 2.04) (end -1 1.21) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.8 -1.5) (end 2.4 -1.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 2.4 -1.5) (end 2.4 -0.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.5) (end -2.4 -1.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.4 -1.5) (end -2.4 -0.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1 1.3) (end 1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.83 -2.05) (end 2.83 -2.05) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.83 2.3) (end 2.83 2.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.83 -2.05) (end 2.83 2.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.83 -2.05) (end -2.83 2.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1 0.3) (end -1 1.5) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -1 1.5) (end 1 1.5) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 1 1.5) (end 1 0.3) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 1 0.3) (end -1 0.3) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -1 1.5) (end -0.5 0.3) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -0.5 1.5) (end 0 0.3) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 0 1.5) (end 0.5 0.3) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 0.5 1.5) (end 1 0.3) (layer Dwgs.User) (width 0.1))
+  (pad "" np_thru_hole circle (at -2.125 0) (size 0.9 0.9) (drill 0.9) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 2.125 0) (size 0.9 0.9) (drill 0.9) (layers *.Cu *.Mask))
+  (pad 1 smd roundrect (at -1.225 -0.9) (size 0.75 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at 1.225 -0.9) (size 0.75 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0 -0.9) (size 0.6 1.8) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at -1.85 1.05) (size 1.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad MP smd roundrect (at 1.85 1.05) (size 1.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T-MP_NO_Horizontal_Alps_SKRTLAE010.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Button_Switch_SMD.pretty/SW_Push_1P1T-SH_NO_CK_KMR2xxG.kicad_mod

@@ -0,0 +1,38 @@
+(module SW_Push_1P1T-SH_NO_CK_KMR2xxG (layer F.Cu) (tedit 5D8D2A01)
+  (descr "CK components KMR2 tactile switch with ground pin http://www.ckswitches.com/media/1479/kmr2.pdf")
+  (tags "tactile switch kmr2")
+  (attr smd)
+  (fp_text reference REF** (at 0 -2.45) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value SW_Push_1P1T-SH_NO_CK_KMR2xxG (at 0 2.55) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.2 0.05) (end -2.2 -0.05) (layer F.SilkS) (width 0.12))
+  (fp_line (start 2.2 -1.55) (end 1.15 -1.55) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.2 1.55) (end 2.2 1.55) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 0 0) (end 0 0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.8 1.8) (end -2.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.8 1.8) (end -2.8 1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.8 -1.8) (end 2.8 1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.8 -1.8) (end 2.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.2 0.05) (end 2.2 -0.05) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.1 1.4) (end -2.1 -1.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.1 1.4) (end -2.1 1.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.1 -1.4) (end 2.1 1.4) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.1 -1.4) (end 2.1 -1.4) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 -2.45) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.15 -1.55) (end -2.2 -1.55) (layer F.SilkS) (width 0.12))
+  (pad 2 smd rect (at 2.05 0.8) (size 0.9 1) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at 2.05 -0.8) (size 0.9 1) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at -2.05 0.8) (size 0.9 1) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -2.05 -0.8) (size 0.9 1) (layers F.Cu F.Paste F.Mask))
+  (pad SH smd rect (at 0 -1.425) (size 1.7 0.55) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T-SH_NO_CK_KMR2xxG.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Button_Switch_SMD.pretty/SW_Push_1P1T_NO_Vertical_Wuerth_434133025816.kicad_mod

@@ -0,0 +1,43 @@
+(module SW_Push_1P1T_NO_Vertical_Wuerth_434133025816 (layer F.Cu) (tedit 5DB98283)
+  (descr https://katalog.we-online.com/em/datasheet/434133025816.pdf)
+  (tags "tactile switch Wurth Wuerth")
+  (attr smd)
+  (fp_text reference REF** (at 0.15 -2.6) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value SW_Push_1P1T_NO_Vertical_Wuerth_434133025816 (at 0 2.55) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0.05 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.1 -1.6) (end 2.1 -1.6) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.1 -1.6) (end 2.1 1.6) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.1 1.6) (end -2.1 1.6) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.1 1.6) (end -2.1 -1.6) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.2 0.05) (end 2.2 -0.05) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.85 -1.85) (end 2.85 -1.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.85 -1.85) (end 2.85 1.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.85 1.85) (end -2.85 1.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.85 1.85) (end -2.85 -1.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.2 1.75) (end 2.2 1.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start 2.2 -1.75) (end -2.2 -1.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.2 0.05) (end -2.2 -0.05) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.9 -1.1) (end 0.8 -1.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.8 1.1) (end -0.9 1.1) (layer F.Fab) (width 0.1))
+  (fp_arc (start -0.100001 0) (end -0.9 -1.099999) (angle -107.9452532) (layer F.Fab) (width 0.1))
+  (fp_arc (start 0.1 0) (end 0.799999 1.099999) (angle -115.0576154) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.1 -1.1) (end -1.6 -1.6) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 -1.6) (end 2.1 -1.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.1 1.1) (end -1.6 1.6) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 1.6) (end 2.1 1.1) (layer F.Fab) (width 0.1))
+  (pad 1 smd rect (at -2.075 -1.075) (size 1.05 0.65) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at -2.075 1.075) (size 1.05 0.65) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at 2.075 -1.075) (size 1.05 0.65) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 2.05 1.075) (size 1.05 0.65) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T_NO_Vertical_Wuerth_434133025816.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Button_Switch_SMD.pretty/SW_SPST_Omron_B3FS-100xP.kicad_mod

@@ -0,0 +1,46 @@
+(module SW_SPST_Omron_B3FS-100xP (layer F.Cu) (tedit 5E6E8EA9)
+  (descr "Surface Mount Tactile Switch for High-Density Mounting, 3.1mm height, https://omronfs.omron.com/en_US/ecb/products/pdf/en-b3fs.pdf")
+  (tags "Tactile Switch")
+  (attr smd)
+  (fp_text reference REF** (at 0 -4.3) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value SW_SPST_Omron_B3FS-100xP (at 0 4.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 2.9 -3.25) (end -2.9 -3.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3 3.25) (end -3 3.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.1 -1.3) (end 3.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.1 -1.3) (end -3.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 -3.15) (end 3 -3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 3 -3.15) (end 3 3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 3 3.15) (end -3 3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -3 3.15) (end -3 -3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -5.05 -3.4) (end 5.05 -3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 -3.4) (end 5.05 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 -1.3) (end 3.25 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.25 -1.3) (end 3.25 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.25 1.3) (end 5.05 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 1.3) (end 5.05 3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 3.4) (end -5.05 3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 3.4) (end -5.05 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 1.3) (end -3.25 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.25 1.3) (end -3.25 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.25 -1.3) (end -5.05 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 -1.3) (end -5.05 -3.4) (layer F.CrtYd) (width 0.05))
+  (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 -2.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -5.1 -2.3) (end -5.1 -3.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.1 -3.3) (end -4.1 -3.3) (layer F.SilkS) (width 0.12))
+  (pad 2 smd rect (at 4 -2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -4 -2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at 4 2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at -4 2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_Omron_B3FS-100xP.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Button_Switch_SMD.pretty/SW_SPST_Omron_B3FS-101xP.kicad_mod

@@ -0,0 +1,46 @@
+(module SW_SPST_Omron_B3FS-101xP (layer F.Cu) (tedit 5E6E8E39)
+  (descr "Surface Mount Tactile Switch for High-Density Mounting, 4.3mm height, https://omronfs.omron.com/en_US/ecb/products/pdf/en-b3fs.pdf")
+  (tags "Tactile Switch")
+  (attr smd)
+  (fp_text reference REF** (at 0 -4.3) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value SW_SPST_Omron_B3FS-101xP (at 0 4.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 2.9 -3.25) (end -2.9 -3.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3 3.25) (end -3 3.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.1 -1.3) (end 3.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.1 -1.3) (end -3.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 -3.15) (end 3 -3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 3 -3.15) (end 3 3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 3 3.15) (end -3 3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -3 3.15) (end -3 -3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -5.05 -3.4) (end 5.05 -3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 -3.4) (end 5.05 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 -1.3) (end 3.25 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.25 -1.3) (end 3.25 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.25 1.3) (end 5.05 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 1.3) (end 5.05 3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 3.4) (end -5.05 3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 3.4) (end -5.05 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 1.3) (end -3.25 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.25 1.3) (end -3.25 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.25 -1.3) (end -5.05 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 -1.3) (end -5.05 -3.4) (layer F.CrtYd) (width 0.05))
+  (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 -2.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -5.1 -3.3) (end -4.1 -3.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.1 -2.3) (end -5.1 -3.3) (layer F.SilkS) (width 0.12))
+  (pad 2 smd rect (at 4 -2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -4 -2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at 4 2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at -4 2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_Omron_B3FS-101xP.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Button_Switch_SMD.pretty/SW_SPST_Omron_B3FS-105xP.kicad_mod

@@ -0,0 +1,46 @@
+(module SW_SPST_Omron_B3FS-105xP (layer F.Cu) (tedit 5E6E8EEE)
+  (descr "Surface Mount Tactile Switch for High-Density Mounting, 7.3mm height, https://omronfs.omron.com/en_US/ecb/products/pdf/en-b3fs.pdf")
+  (tags "Tactile Switch")
+  (attr smd)
+  (fp_text reference REF** (at 0 -4.3) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value SW_SPST_Omron_B3FS-105xP (at 0 4.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 2.9 -3.25) (end -2.9 -3.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3 3.25) (end -3 3.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.1 -1.3) (end 3.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.1 -1.3) (end -3.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 -3.15) (end 3 -3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 3 -3.15) (end 3 3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 3 3.15) (end -3 3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -3 3.15) (end -3 -3.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -5.05 -3.4) (end 5.05 -3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 -3.4) (end 5.05 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 -1.3) (end 3.25 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.25 -1.3) (end 3.25 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.25 1.3) (end 5.05 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 1.3) (end 5.05 3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.05 3.4) (end -5.05 3.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 3.4) (end -5.05 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 1.3) (end -3.25 1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.25 1.3) (end -3.25 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.25 -1.3) (end -5.05 -1.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.05 -1.3) (end -5.05 -3.4) (layer F.CrtYd) (width 0.05))
+  (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 -2.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -5.1 -3.3) (end -4.1 -3.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.1 -2.3) (end -5.1 -3.3) (layer F.SilkS) (width 0.12))
+  (pad 2 smd rect (at 4 -2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -4 -2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at 4 2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at -4 2.25 180) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_Omron_B3FS-105xP.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)

Button_Switch_THT.pretty/SW_PUSH-12mm.kicad_mod

@@ -1,4 +1,4 @@
-(module SW_PUSH-12mm (layer F.Cu) (tedit 5A02FE31)
+(module SW_PUSH-12mm (layer F.Cu) (tedit 5D160D14)
   (descr "SW PUSH 12mm https://www.e-switch.com/system/asset/product_line/data_sheet/143/TL1100.pdf")
   (tags "tact sw push 12mm")
   (fp_text reference REF** (at 6.08 -4.66) (layer F.SilkS)
@@ -27,13 +27,13 @@
   (fp_line (start 0.1 4.07) (end 0.1 0.93) (layer F.SilkS) (width 0.12))
   (fp_line (start 12.4 5.93) (end 12.4 8.65) (layer F.SilkS) (width 0.12))
   (fp_line (start 12.4 -3.65) (end 12.4 -0.93) (layer F.SilkS) (width 0.12))
-  (pad 1 thru_hole oval (at 12.5 0) (size 3.048 1.7272) (drill 0.8128) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at 12.5 5) (size 3.048 1.7272) (drill 0.8128) (layers *.Cu *.Mask))
-  (pad 1 thru_hole oval (at 0 0) (size 3.048 1.7272) (drill 0.8128) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at 0 5) (size 3.048 1.7272) (drill 0.8128) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at 12.5 0) (size 3.048 1.85) (drill 1.3) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 12.5 5) (size 3.048 1.85) (drill 1.3) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at 0 0) (size 3.048 1.85) (drill 1.3) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 5) (size 3.048 1.85) (drill 1.3) (layers *.Cu *.Mask))
   (model ${KISYS3DMOD}/Button_Switch_THT.3dshapes/SW_PUSH-12mm.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
   )
-)
+)

Button_Switch_THT.pretty/SW_TH_Tactile_Omron_B3F-10xx.kicad_mod

@@ -1,4 +1,4 @@
-(module SW_TH_Tactile_Omron_B3F-10xx (layer F.Cu) (tedit 5A02FE31)
+(module SW_TH_Tactile_Omron_B3F-10xx (layer F.Cu) (tedit 5D84F0EF)
   (descr SW_TH_Tactile_Omron_B3F-10xx_https://www.omron.com/ecb/products/pdf/en-b3f.pdf)
   (tags "Omron B3F-10xx")
   (fp_text reference REF** (at 3.25 -2.05) (layer F.SilkS)
@@ -13,16 +13,16 @@
   (fp_text user %R (at 3.25 2.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 7.65 -1.15) (end -1.1 -1.15) (layer F.CrtYd) (width 0.05))
   (fp_line (start 7.6 5.6) (end 7.6 -1.1) (layer F.CrtYd) (width 0.05))
   (fp_line (start -1.1 5.6) (end 7.6 5.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.1 -1.15) (end -1.1 5.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.1 -1.1) (end -1.1 5.6) (layer F.CrtYd) (width 0.05))
   (fp_circle (center 3.25 2.25) (end 4.25 3.25) (layer F.SilkS) (width 0.12))
   (fp_line (start 0.28 5.37) (end 6.22 5.37) (layer F.SilkS) (width 0.12))
   (fp_line (start 0.28 -0.87) (end 6.22 -0.87) (layer F.SilkS) (width 0.12))
   (fp_line (start 0.13 3.59) (end 0.13 0.91) (layer F.SilkS) (width 0.12))
   (fp_line (start 6.37 0.91) (end 6.37 3.59) (layer F.SilkS) (width 0.12))
   (fp_line (start 0.25 5.25) (end 6.25 5.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.1 -1.1) (end 7.6 -1.1) (layer F.CrtYd) (width 0.05))
   (pad 4 thru_hole circle (at 6.5 4.5) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 3 thru_hole circle (at 0 4.5) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 2 thru_hole circle (at 6.5 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))

Button_Switch_THT.pretty/SW_Tactile_SKHH_Angled.kicad_mod

@@ -1,4 +1,4 @@
-(module SW_Tactile_SKHH_Angled (layer F.Cu) (tedit 5A02FE31)
+(module SW_Tactile_SKHH_Angled (layer F.Cu) (tedit 5DD687FE)
   (descr "tactile switch 6mm ALPS SKHH right angle http://www.alps.com/prod/info/E/HTML/Tact/SnapIn/SKHH/SKHHLUA010.html")
   (tags "tactile switch 6mm ALPS SKHH right angle")
   (fp_text reference REF** (at 2.25 2.5) (layer F.SilkS)
@@ -13,7 +13,7 @@
   (fp_text user %R (at 2.25 -1.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 0.2 4.25) (end -2.6 4.25) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.1 4.25) (end -2.6 4.25) (layer F.CrtYd) (width 0.05))
   (fp_line (start -2.6 4.25) (end -2.6 1.15) (layer F.CrtYd) (width 0.05))
   (fp_line (start -2.6 1.15) (end -1.75 1.15) (layer F.CrtYd) (width 0.05))
   (fp_line (start -1.75 1.15) (end -1.75 -2.8) (layer F.CrtYd) (width 0.05))
@@ -27,7 +27,7 @@
   (fp_line (start 4.15 -6.1) (end 0.35 -6.1) (layer F.CrtYd) (width 0.05))
   (fp_line (start 0.35 -6.1) (end 0.35 -2.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 0.35 -2.8) (end -1.75 -2.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.1 4.3) (end 0.1 1.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.1 4.25) (end 0.1 1.7) (layer F.CrtYd) (width 0.05))
   (fp_line (start 4.4 1.7) (end 4.4 4.25) (layer F.CrtYd) (width 0.05))
   (fp_line (start 0.6 -5.85) (end 3.9 -5.85) (layer F.Fab) (width 0.1))
   (fp_line (start 6 -2.55) (end 6 4) (layer F.Fab) (width 0.1))
@@ -44,14 +44,6 @@
   (fp_line (start 6.12 -2.67) (end -1.62 -2.67) (layer F.SilkS) (width 0.12))
   (fp_line (start -1.62 -2.67) (end -1.62 1.18) (layer F.SilkS) (width 0.12))
   (fp_line (start -0.24 1.57) (end 4.74 1.57) (layer F.SilkS) (width 0.12))
-  (fp_circle (center 0 0) (end -0.4445 0) (layer F.Mask) (width 0))
-  (fp_circle (center 4.5 0) (end 4.0555 0) (layer F.Mask) (width 0))
-  (fp_circle (center 5.75 2.5) (end 5.115 2.5) (layer F.Mask) (width 0))
-  (fp_circle (center -1.25 2.5) (end -1.885 2.5) (layer F.Mask) (width 0))
-  (fp_circle (center 5.75 2.5) (end 4.607 2.5) (layer B.Mask) (width 0))
-  (fp_circle (center 0 0) (end -0.889 0) (layer B.Mask) (width 0))
-  (fp_circle (center 4.5 0) (end 3.611 0) (layer B.Mask) (width 0))
-  (fp_circle (center -1.25 2.5) (end -2.393 2.5) (layer B.Mask) (width 0))
   (fp_line (start -0.73 4.12) (end -1.62 4.12) (layer F.SilkS) (width 0.12))
   (fp_line (start -0.73 4.12) (end -0.73 3.77) (layer F.SilkS) (width 0.12))
   (fp_line (start -1.62 3.82) (end -1.62 4.12) (layer F.SilkS) (width 0.12))

Buzzer_Beeper.pretty/Buzzer_D14mm_H7mm_P10mm.kicad_mod

@@ -0,0 +1,30 @@
+(module Buzzer_D14mm_H7mm_P10mm (layer F.Cu) (tedit 5D8D727F)
+  (descr "Generic Buzzer, D14mm height 7mm with pitch 10mm")
+  (tags buzzer)
+  (fp_text reference REF** (at 5.16 -8.23) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Buzzer_D14mm_H7mm_P10mm (at 4.69 8.41) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center 5 0) (end 6 0) (layer F.Fab) (width 0.1))
+  (fp_circle (center 5 0) (end 12 0) (layer F.Fab) (width 0.1))
+  (fp_circle (center 5 0) (end 12.1 0) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 5 0) (end 12.25 0) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 5.32 2.27) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user + (at -0.01 -2.54) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user + (at -0.01 -2.54) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 2 thru_hole circle (at 10 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))
+  (model ${KISYS3DMOD}/Buzzer_Beeper.3dshapes/Buzzer_D14mm_H7mm_P10mm.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)