diff --git a/Capacitor_SMD.pretty/C_01005_0402Metric.kicad_mod b/Capacitor_SMD.pretty/C_01005_0402Metric.kicad_mod
index dca5367183c..7508a021534 100644
--- a/Capacitor_SMD.pretty/C_01005_0402Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_01005_0402Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module C_01005_0402Metric (layer F.Cu) (tedit 5B301BBE)
+(module C_01005_0402Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Capacitor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
diff --git a/Capacitor_SMD.pretty/C_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..4b464566315
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_01005_0402Metric_Pad0.57x0.30mm_HandSolder (layer F.Cu) (tedit 5F6BBCCE)
+  (descr "Capacitor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_01005_0402Metric_Pad0.57x0.30mm_HandSolder (at 0 1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.2 0.1) (end -0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 -0.1) (end 0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 -0.1) (end 0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 0.1) (end -0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.78 0.3) (end -0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.78 -0.3) (end 0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 -0.3) (end 0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 0.3) (end -0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.62) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_01005_0402Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_0201_0603Metric.kicad_mod b/Capacitor_SMD.pretty/C_0201_0603Metric.kicad_mod
index ae249ebf69f..9389727d345 100644
--- a/Capacitor_SMD.pretty/C_0201_0603Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_0201_0603Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module C_0201_0603Metric (layer F.Cu) (tedit 5B301BBE)
+(module C_0201_0603Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
diff --git a/Capacitor_SMD.pretty/C_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..f4ee696d690
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_0201_0603Metric_Pad0.64x0.40mm_HandSolder (layer F.Cu) (tedit 5F6BB9E0)
+  (descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_0201_0603Metric_Pad0.64x0.40mm_HandSolder (at 0 1.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.88 0.35) (end -0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.88 -0.35) (end 0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 -0.35) (end 0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 0.35) (end -0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.68) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_0402_1005Metric.kicad_mod b/Capacitor_SMD.pretty/C_0402_1005Metric.kicad_mod
index 684748bb82c..3e4fd037370 100644
--- a/Capacitor_SMD.pretty/C_0402_1005Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_0402_1005Metric.kicad_mod
@@ -1,23 +1,25 @@
-(module C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module C_0402_1005Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
-  (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -1.16) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value C_0402_1005Metric (at 0 1.17) (layer F.Fab)
+  (fp_text value C_0402_1005Metric (at 0 1.16) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
   (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
   (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
   (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.485 0) (size 0.59 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_line (start -0.107836 -0.36) (end 0.107836 -0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.107836 0.36) (end 0.107836 0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.91 0.46) (end -0.91 -0.46) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.91 -0.46) (end 0.91 -0.46) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.91 -0.46) (end 0.91 0.46) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.91 0.46) (end -0.91 0.46) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.48 0) (size 0.56 0.62) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.48 0) (size 0.56 0.62) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.25 0.25) (thickness 0.04)))
   )
diff --git a/Capacitor_SMD.pretty/C_0402_1005Metric_Pad0.74x0.62mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_0402_1005Metric_Pad0.74x0.62mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..794aca0ac78
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_0402_1005Metric_Pad0.74x0.62mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_0402_1005Metric_Pad0.74x0.62mm_HandSolder (layer F.Cu) (tedit 5F6BB22C)
+  (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.16) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_0402_1005Metric_Pad0.74x0.62mm_HandSolder (at 0 1.16) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.115835 -0.36) (end 0.115835 -0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.115835 0.36) (end 0.115835 0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.08 0.46) (end -1.08 -0.46) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.08 -0.46) (end 1.08 -0.46) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.08 -0.46) (end 1.08 0.46) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.08 0.46) (end -1.08 0.46) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5675 0) (size 0.735 0.62) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5675 0) (size 0.735 0.62) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_0504_1310Metric.kicad_mod b/Capacitor_SMD.pretty/C_0504_1310Metric.kicad_mod
new file mode 100644
index 00000000000..ea04aa43396
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_0504_1310Metric.kicad_mod
@@ -0,0 +1,29 @@
+(module C_0504_1310Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 0504 (1310 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags capacitor)
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.49) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_0504_1310Metric (at 0 1.49) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.585 0.51) (end -0.585 -0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.585 -0.51) (end 0.585 -0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.585 -0.51) (end 0.585 0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.585 0.51) (end -0.585 0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.02 0.79) (end -1.02 -0.79) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.02 -0.79) (end 1.02 -0.79) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.02 -0.79) (end 1.02 0.79) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.02 0.79) (end -1.02 0.79) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.54 0) (size 0.66 1.28) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.54 0) (size 0.66 1.28) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.29 0.29) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0504_1310Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_0504_1310Metric_Pad0.83x1.28mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_0504_1310Metric_Pad0.83x1.28mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..740a5bfa915
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_0504_1310Metric_Pad0.83x1.28mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_0504_1310Metric_Pad0.83x1.28mm_HandSolder (layer F.Cu) (tedit 5F6BB22C)
+  (descr "Capacitor SMD 0504 (1310 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.49) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_0504_1310Metric_Pad0.83x1.28mm_HandSolder (at 0 1.49) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.585 0.51) (end -0.585 -0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.585 -0.51) (end 0.585 -0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.585 -0.51) (end 0.585 0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.585 0.51) (end -0.585 0.51) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.101969 -0.62) (end 0.101969 -0.62) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.101969 0.62) (end 0.101969 0.62) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.19 0.79) (end -1.19 -0.79) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.19 -0.79) (end 1.19 -0.79) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.19 -0.79) (end 1.19 0.79) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.19 0.79) (end -1.19 0.79) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.6275 0) (size 0.835 1.28) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.6275 0) (size 0.835 1.28) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.29 0.29) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0504_1310Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_0603_1608Metric.kicad_mod b/Capacitor_SMD.pretty/C_0603_1608Metric.kicad_mod
index 21e70ea05a3..e55e431a174 100644
--- a/Capacitor_SMD.pretty/C_0603_1608Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_0603_1608Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module C_0603_1608Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
   (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
@@ -12,14 +12,14 @@
   (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
   (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
   (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.14058 -0.51) (end 0.14058 -0.51) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.14058 0.51) (end 0.14058 0.51) (layer F.SilkS) (width 0.12))
   (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.775 0) (size 0.9 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.775 0) (size 0.9 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.4 0.4) (thickness 0.06)))
   )
diff --git a/Capacitor_SMD.pretty/C_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_0603_1608Metric_Pad1.08x0.95mm_HandSolder.kicad_mod
similarity index 64%
rename from Capacitor_SMD.pretty/C_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
rename to Capacitor_SMD.pretty/C_0603_1608Metric_Pad1.08x0.95mm_HandSolder.kicad_mod
index 2c882c6f907..ce8dbfbd047 100644
--- a/Capacitor_SMD.pretty/C_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
+++ b/Capacitor_SMD.pretty/C_0603_1608Metric_Pad1.08x0.95mm_HandSolder.kicad_mod
@@ -1,25 +1,25 @@
-(module C_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module C_0603_1608Metric_Pad1.08x0.95mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
+  (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags "capacitor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value C_0603_1608Metric_Pad1.05x0.95mm_HandSolder (at 0 1.43) (layer F.Fab)
+  (fp_text value C_0603_1608Metric_Pad1.08x0.95mm_HandSolder (at 0 1.43) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
   (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
   (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
   (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.146267 -0.51) (end 0.146267 -0.51) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.146267 0.51) (end 0.146267 0.51) (layer F.SilkS) (width 0.12))
   (fp_line (start -1.65 0.73) (end -1.65 -0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start -1.65 -0.73) (end 1.65 -0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.65 -0.73) (end 1.65 0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.65 0.73) (end -1.65 0.73) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.875 0) (size 1.05 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.875 0) (size 1.05 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.8625 0) (size 1.075 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.8625 0) (size 1.075 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.4 0.4) (thickness 0.06)))
   )
diff --git a/Capacitor_SMD.pretty/C_0805_2012Metric.kicad_mod b/Capacitor_SMD.pretty/C_0805_2012Metric.kicad_mod
index 98d3763b088..009be197136 100644
--- a/Capacitor_SMD.pretty/C_0805_2012Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_0805_2012Metric.kicad_mod
@@ -1,25 +1,25 @@
-(module C_0805_2012Metric (layer F.Cu) (tedit 5B36C52B)
-  (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+(module C_0805_2012Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
-  (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -1.68) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value C_0805_2012Metric (at 0 1.65) (layer F.Fab)
+  (fp_text value C_0805_2012Metric (at 0 1.68) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.7 0.98) (end -1.7 -0.98) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.7 -0.98) (end 1.7 -0.98) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.7 -0.98) (end 1.7 0.98) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.7 0.98) (end -1.7 0.98) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.95 0) (size 1 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.95 0) (size 1 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
diff --git a/Capacitor_SMD.pretty/C_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
deleted file mode 100644
index a5d2e347903..00000000000
--- a/Capacitor_SMD.pretty/C_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B)
-  (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (at 0 1.65) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
-  (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.5 0.5) (thickness 0.08)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_0805_2012Metric_Pad1.18x1.45mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_0805_2012Metric_Pad1.18x1.45mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..51d6d8e2a8c
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_0805_2012Metric_Pad1.18x1.45mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
+  (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.68) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_0805_2012Metric_Pad1.18x1.45mm_HandSolder (at 0 1.68) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.212766))
+  (pad 2 smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.212766))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.5 0.5) (thickness 0.08)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1206_3216Metric.kicad_mod b/Capacitor_SMD.pretty/C_1206_3216Metric.kicad_mod
index fb2510bc715..833b1fe6d8c 100644
--- a/Capacitor_SMD.pretty/C_1206_3216Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_1206_3216Metric.kicad_mod
@@ -1,25 +1,25 @@
-(module C_1206_3216Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module C_1206_3216Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
-  (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value C_1206_3216Metric (at 0 1.82) (layer F.Fab)
+  (fp_text value C_1206_3216Metric (at 0 1.85) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
   (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -0.91) (end 0.602064 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 0.91) (end 0.602064 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.28 1.12) (end -2.28 -1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.28 -1.12) (end 2.28 -1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.28 -1.12) (end 2.28 1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.28 1.12) (end -2.28 1.12) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4 0) (size 1.25 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
-  (pad 2 smd roundrect (at 1.4 0) (size 1.25 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
+  (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.3 1.15) (end -2.3 -1.15) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.3 -1.15) (end 2.3 -1.15) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.3 -1.15) (end 2.3 1.15) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.3 1.15) (end -2.3 1.15) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.475 0) (size 1.15 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
+  (pad 2 smd roundrect (at 1.475 0) (size 1.15 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
diff --git a/Capacitor_SMD.pretty/C_1206_3216Metric_Pad1.33x1.80mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1206_3216Metric_Pad1.33x1.80mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..bfc17a1181f
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_1206_3216Metric_Pad1.33x1.80mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
+  (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_1206_3216Metric_Pad1.33x1.80mm_HandSolder (at 0 1.85) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.711252 -0.91) (end 0.711252 -0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.711252 0.91) (end 0.711252 0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.48 1.15) (end -2.48 -1.15) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.48 -1.15) (end 2.48 -1.15) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.48 -1.15) (end 2.48 1.15) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.48 1.15) (end -2.48 1.15) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.5625 0) (size 1.325 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.188679))
+  (pad 2 smd roundrect (at 1.5625 0) (size 1.325 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.188679))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.8 0.8) (thickness 0.12)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
deleted file mode 100644
index b9cf2138475..00000000000
--- a/Capacitor_SMD.pretty/C_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_1206_3216Metric_Pad1.42x1.75mm_HandSolder (at 0 1.82) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -0.91) (end 0.602064 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 0.91) (end 0.602064 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.45 1.12) (end -2.45 -1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.45 -1.12) (end 2.45 -1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.45 -1.12) (end 2.45 1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.45 1.12) (end -2.45 1.12) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4875 0) (size 1.425 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
-  (pad 2 smd roundrect (at 1.4875 0) (size 1.425 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.8 0.8) (thickness 0.12)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1210_3225Metric.kicad_mod b/Capacitor_SMD.pretty/C_1210_3225Metric.kicad_mod
index c323e262fd4..60e9dd5ca43 100644
--- a/Capacitor_SMD.pretty/C_1210_3225Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_1210_3225Metric.kicad_mod
@@ -1,25 +1,25 @@
-(module C_1210_3225Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module C_1210_3225Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
-  (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -2.3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value C_1210_3225Metric (at 0 2.28) (layer F.Fab)
+  (fp_text value C_1210_3225Metric (at 0 2.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
   (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.28 1.58) (end -2.28 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.28 -1.58) (end 2.28 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.28 -1.58) (end 2.28 1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.28 1.58) (end -2.28 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4 0) (size 1.25 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
-  (pad 2 smd roundrect (at 1.4 0) (size 1.25 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
+  (fp_line (start -0.711252 -1.36) (end 0.711252 -1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.711252 1.36) (end 0.711252 1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.3 1.6) (end -2.3 -1.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.3 -1.6) (end 2.3 -1.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.3 -1.6) (end 2.3 1.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.3 1.6) (end -2.3 1.6) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.475 0) (size 1.15 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
+  (pad 2 smd roundrect (at 1.475 0) (size 1.15 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
diff --git a/Capacitor_SMD.pretty/C_1210_3225Metric_Pad1.33x2.70mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1210_3225Metric_Pad1.33x2.70mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..0916c0c2bcb
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_1210_3225Metric_Pad1.33x2.70mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_1210_3225Metric_Pad1.33x2.70mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
+  (descr "Capacitor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -2.3) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_1210_3225Metric_Pad1.33x2.70mm_HandSolder (at 0 2.3) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.711252 -1.36) (end 0.711252 -1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.711252 1.36) (end 0.711252 1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.48 1.6) (end -2.48 -1.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.48 -1.6) (end 2.48 -1.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.48 -1.6) (end 2.48 1.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.48 1.6) (end -2.48 1.6) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.5625 0) (size 1.325 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.188679))
+  (pad 2 smd roundrect (at 1.5625 0) (size 1.325 2.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.188679))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.8 0.8) (thickness 0.12)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1210_3225Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
deleted file mode 100644
index 7b2cd0806c2..00000000000
--- a/Capacitor_SMD.pretty/C_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_1210_3225Metric_Pad1.42x2.65mm_HandSolder (at 0 2.28) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4875 0) (size 1.425 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
-  (pad 2 smd roundrect (at 1.4875 0) (size 1.425 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.8 0.8) (thickness 0.12)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1210_3225Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1806_4516Metric.kicad_mod b/Capacitor_SMD.pretty/C_1806_4516Metric.kicad_mod
deleted file mode 100644
index b239cc5ff48..00000000000
--- a/Capacitor_SMD.pretty/C_1806_4516Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_1806_4516Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags capacitor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_1806_4516Metric (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.95 1.15) (end -2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.95 -1.15) (end 2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 -1.15) (end 2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 1.15) (end -2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (pad 2 smd roundrect (at 2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
deleted file mode 100644
index dc4ca9c26fa..00000000000
--- a/Capacitor_SMD.pretty/C_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_1806_4516Metric_Pad1.57x1.80mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_1806_4516Metric_Pad1.57x1.80mm_HandSolder (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.12 1.15) (end -3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.12 -1.15) (end 3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 -1.15) (end 3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 1.15) (end -3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (pad 2 smd roundrect (at 2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1812_4532Metric.kicad_mod b/Capacitor_SMD.pretty/C_1812_4532Metric.kicad_mod
index d03702d6556..3caef28bb5e 100644
--- a/Capacitor_SMD.pretty/C_1812_4532Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_1812_4532Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module C_1812_4532Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
+(module C_1812_4532Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
   (fp_text reference REF** (at 0 -2.65) (layer F.SilkS)
@@ -12,14 +12,14 @@
   (fp_line (start -2.25 -1.6) (end 2.25 -1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 2.25 -1.6) (end 2.25 1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 2.25 1.6) (end -2.25 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.386252 -1.71) (end 1.386252 -1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.386252 1.71) (end 1.386252 1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.95 1.95) (end -2.95 -1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.95 -1.95) (end 2.95 -1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 -1.95) (end 2.95 1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 1.95) (end -2.95 1.95) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.1375 0) (size 1.125 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.222222))
-  (pad 2 smd roundrect (at 2.1375 0) (size 1.125 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.222222))
+  (fp_line (start -1.161252 -1.71) (end 1.161252 -1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.161252 1.71) (end 1.161252 1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 1.95) (end -3 -1.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3 -1.95) (end 3 -1.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 -1.95) (end 3 1.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 1.95) (end -3 1.95) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -2.05 0) (size 1.4 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
+  (pad 2 smd roundrect (at 2.05 0) (size 1.4 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Capacitor_SMD.pretty/C_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1812_4532Metric_Pad1.57x3.40mm_HandSolder.kicad_mod
similarity index 51%
rename from Capacitor_SMD.pretty/C_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
rename to Capacitor_SMD.pretty/C_1812_4532Metric_Pad1.57x3.40mm_HandSolder.kicad_mod
index a2a2c9d5662..2bf0ec0ffdd 100644
--- a/Capacitor_SMD.pretty/C_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
+++ b/Capacitor_SMD.pretty/C_1812_4532Metric_Pad1.57x3.40mm_HandSolder.kicad_mod
@@ -1,25 +1,25 @@
-(module C_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
+(module C_1812_4532Metric_Pad1.57x3.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
+  (descr "Capacitor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags "capacitor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value C_1812_4532Metric_Pad1.30x3.40mm_HandSolder (at 0 2.65) (layer F.Fab)
+  (fp_text value C_1812_4532Metric_Pad1.57x3.40mm_HandSolder (at 0 2.65) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -2.25 1.6) (end -2.25 -1.6) (layer F.Fab) (width 0.1))
   (fp_line (start -2.25 -1.6) (end 2.25 -1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 2.25 -1.6) (end 2.25 1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 2.25 1.6) (end -2.25 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.386252 -1.71) (end 1.386252 -1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.386252 1.71) (end 1.386252 1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.12 1.95) (end -3.12 -1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.12 -1.95) (end 3.12 -1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 -1.95) (end 3.12 1.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 1.95) (end -3.12 1.95) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.225 0) (size 1.3 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
-  (pad 2 smd roundrect (at 2.225 0) (size 1.3 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (fp_line (start -1.161252 -1.71) (end 1.161252 -1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.161252 1.71) (end 1.161252 1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.18 1.95) (end -3.18 -1.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.18 -1.95) (end 3.18 -1.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.18 -1.95) (end 3.18 1.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.18 1.95) (end -3.18 1.95) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -2.1375 0) (size 1.575 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
+  (pad 2 smd roundrect (at 2.1375 0) (size 1.575 3.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Capacitor_SMD.pretty/C_1825_4564Metric.kicad_mod b/Capacitor_SMD.pretty/C_1825_4564Metric.kicad_mod
index 6dedea7d610..1dc490f5f47 100644
--- a/Capacitor_SMD.pretty/C_1825_4564Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_1825_4564Metric.kicad_mod
@@ -1,25 +1,25 @@
-(module C_1825_4564Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1825 (4564 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
+(module C_1825_4564Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Capacitor SMD 1825 (4564 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
-  (fp_text reference REF** (at 0 -4.3) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -4.35) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value C_1825_4564Metric (at 0 4.3) (layer F.Fab)
+  (fp_text value C_1825_4564Metric (at 0 4.35) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -2.3 3.15) (end -2.3 -3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.3 -3.15) (end 2.3 -3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.3 -3.15) (end 2.3 3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.3 3.15) (end -2.3 3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.965748 -3.26) (end 0.965748 -3.26) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.965748 3.26) (end 0.965748 3.26) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.15 3.6) (end -3.15 -3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.15 -3.6) (end 3.15 -3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 -3.6) (end 3.15 3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 3.6) (end -3.15 3.6) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.05 0) (size 1.7 6.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
-  (pad 2 smd roundrect (at 2.05 0) (size 1.7 6.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
+  (fp_line (start -2.25 3.2) (end -2.25 -3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.25 -3.2) (end 2.25 -3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 -3.2) (end 2.25 3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 3.2) (end -2.25 3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.115748 -3.31) (end 1.115748 -3.31) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.115748 3.31) (end 1.115748 3.31) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 3.65) (end -3 -3.65) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3 -3.65) (end 3 -3.65) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 -3.65) (end 3 3.65) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 3.65) (end -3 3.65) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -2.05 0) (size 1.4 6.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
+  (pad 2 smd roundrect (at 2.05 0) (size 1.4 6.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Capacitor_SMD.pretty/C_1825_4564Metric_Pad1.57x6.80mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1825_4564Metric_Pad1.57x6.80mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..af35f751014
--- /dev/null
+++ b/Capacitor_SMD.pretty/C_1825_4564Metric_Pad1.57x6.80mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module C_1825_4564Metric_Pad1.57x6.80mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
+  (descr "Capacitor SMD 1825 (4564 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -4.35) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value C_1825_4564Metric_Pad1.57x6.80mm_HandSolder (at 0 4.35) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.25 3.2) (end -2.25 -3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.25 -3.2) (end 2.25 -3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 -3.2) (end 2.25 3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 3.2) (end -2.25 3.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.115748 -3.31) (end 1.115748 -3.31) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.115748 3.31) (end 1.115748 3.31) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.18 3.65) (end -3.18 -3.65) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.18 -3.65) (end 3.18 -3.65) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.18 -3.65) (end 3.18 3.65) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.18 3.65) (end -3.18 3.65) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -2.1375 0) (size 1.575 6.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
+  (pad 2 smd roundrect (at 2.1375 0) (size 1.575 6.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1825_4564Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_1825_4564Metric_Pad1.88x6.70mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_1825_4564Metric_Pad1.88x6.70mm_HandSolder.kicad_mod
deleted file mode 100644
index 640aa00f911..00000000000
--- a/Capacitor_SMD.pretty/C_1825_4564Metric_Pad1.88x6.70mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_1825_4564Metric_Pad1.88x6.70mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1825 (4564 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -4.3) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_1825_4564Metric_Pad1.88x6.70mm_HandSolder (at 0 4.3) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.3 3.15) (end -2.3 -3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.3 -3.15) (end 2.3 -3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.3 -3.15) (end 2.3 3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.3 3.15) (end -2.3 3.15) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.965748 -3.26) (end 0.965748 -3.26) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.965748 3.26) (end 0.965748 3.26) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.32 3.6) (end -3.32 -3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.32 -3.6) (end 3.32 -3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.32 -3.6) (end 3.32 3.6) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.32 3.6) (end -3.32 3.6) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.1375 0) (size 1.875 6.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.133333))
-  (pad 2 smd roundrect (at 2.1375 0) (size 1.875 6.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.133333))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_1825_4564Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_2010_5025Metric.kicad_mod b/Capacitor_SMD.pretty/C_2010_5025Metric.kicad_mod
deleted file mode 100644
index 9af96ad4b38..00000000000
--- a/Capacitor_SMD.pretty/C_2010_5025Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_2010_5025Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags capacitor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_2010_5025Metric (at 0 2.28) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.5 1.25) (end -2.5 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.5 -1.25) (end 2.5 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.5 -1.25) (end 2.5 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.5 1.25) (end -2.5 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.402064 -1.36) (end 1.402064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.402064 1.36) (end 1.402064 1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.18 1.58) (end -3.18 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.18 -1.58) (end 3.18 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.18 -1.58) (end 3.18 1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.18 1.58) (end -3.18 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.25 0) (size 1.35 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
-  (pad 2 smd roundrect (at 2.25 0) (size 1.35 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_2010_5025Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
deleted file mode 100644
index 631cee567d9..00000000000
--- a/Capacitor_SMD.pretty/C_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_2010_5025Metric_Pad1.52x2.65mm_HandSolder (at 0 2.28) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.5 1.25) (end -2.5 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.5 -1.25) (end 2.5 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.5 -1.25) (end 2.5 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.5 1.25) (end -2.5 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.402064 -1.36) (end 1.402064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.402064 1.36) (end 1.402064 1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.35 1.58) (end -3.35 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.35 -1.58) (end 3.35 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.35 -1.58) (end 3.35 1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.35 1.58) (end -3.35 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.3375 0) (size 1.525 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (pad 2 smd roundrect (at 2.3375 0) (size 1.525 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_2010_5025Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_2220_5650Metric.kicad_mod b/Capacitor_SMD.pretty/C_2220_5650Metric.kicad_mod
index ce576076fe8..76390454fa7 100644
--- a/Capacitor_SMD.pretty/C_2220_5650Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_2220_5650Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module C_2220_5650Metric (layer F.Cu) (tedit 5B301BBE)
+(module C_2220_5650Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Capacitor SMD 2220 (5650 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
diff --git a/Capacitor_SMD.pretty/C_2220_5650Metric_Pad1.97x5.40mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_2220_5650Metric_Pad1.97x5.40mm_HandSolder.kicad_mod
index 95712cadb82..cee8ae984c2 100644
--- a/Capacitor_SMD.pretty/C_2220_5650Metric_Pad1.97x5.40mm_HandSolder.kicad_mod
+++ b/Capacitor_SMD.pretty/C_2220_5650Metric_Pad1.97x5.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module C_2220_5650Metric_Pad1.97x5.40mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module C_2220_5650Metric_Pad1.97x5.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
   (descr "Capacitor SMD 2220 (5650 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
   (tags "capacitor handsolder")
   (attr smd)
diff --git a/Capacitor_SMD.pretty/C_2225_5664Metric.kicad_mod b/Capacitor_SMD.pretty/C_2225_5664Metric.kicad_mod
index f716f4925e6..db940a9ef6e 100644
--- a/Capacitor_SMD.pretty/C_2225_5664Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_2225_5664Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module C_2225_5664Metric (layer F.Cu) (tedit 5B301BBE)
+(module C_2225_5664Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Capacitor SMD 2225 (5664 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
diff --git a/Capacitor_SMD.pretty/C_2225_5664Metric_Pad1.80x6.60mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_2225_5664Metric_Pad1.80x6.60mm_HandSolder.kicad_mod
index c35bd1c117f..970d2128224 100644
--- a/Capacitor_SMD.pretty/C_2225_5664Metric_Pad1.80x6.60mm_HandSolder.kicad_mod
+++ b/Capacitor_SMD.pretty/C_2225_5664Metric_Pad1.80x6.60mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module C_2225_5664Metric_Pad1.80x6.60mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module C_2225_5664Metric_Pad1.80x6.60mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
   (descr "Capacitor SMD 2225 (5664 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
   (tags "capacitor handsolder")
   (attr smd)
diff --git a/Capacitor_SMD.pretty/C_2512_6332Metric.kicad_mod b/Capacitor_SMD.pretty/C_2512_6332Metric.kicad_mod
deleted file mode 100644
index 547d7e93fa8..00000000000
--- a/Capacitor_SMD.pretty/C_2512_6332Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_2512_6332Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags capacitor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_2512_6332Metric (at 0 2.62) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -3.15 1.6) (end -3.15 -1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.15 -1.6) (end 3.15 -1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.15 -1.6) (end 3.15 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.15 1.6) (end -3.15 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.052064 -1.71) (end 2.052064 -1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.052064 1.71) (end 2.052064 1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.82 1.92) (end -3.82 -1.92) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.82 -1.92) (end 3.82 -1.92) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.82 -1.92) (end 3.82 1.92) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.82 1.92) (end -3.82 1.92) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.9 0) (size 1.35 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
-  (pad 2 smd roundrect (at 2.9 0) (size 1.35 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_2512_6332Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
deleted file mode 100644
index fdf8e1fa3ab..00000000000
--- a/Capacitor_SMD.pretty/C_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_2512_6332Metric_Pad1.52x3.35mm_HandSolder (at 0 2.62) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -3.15 1.6) (end -3.15 -1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.15 -1.6) (end 3.15 -1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.15 -1.6) (end 3.15 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.15 1.6) (end -3.15 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.052064 -1.71) (end 2.052064 -1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.052064 1.71) (end 2.052064 1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4 1.92) (end -4 -1.92) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4 -1.92) (end 4 -1.92) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4 -1.92) (end 4 1.92) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4 1.92) (end -4 1.92) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.9875 0) (size 1.525 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (pad 2 smd roundrect (at 2.9875 0) (size 1.525 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_2512_6332Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_2816_7142Metric.kicad_mod b/Capacitor_SMD.pretty/C_2816_7142Metric.kicad_mod
deleted file mode 100644
index a88c3915d58..00000000000
--- a/Capacitor_SMD.pretty/C_2816_7142Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_2816_7142Metric (layer F.Cu) (tedit 5B341556)
-  (descr "Capacitor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
-  (tags capacitor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -3.18) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_2816_7142Metric (at 0 3.18) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -3.55 2.1) (end -3.55 -2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.55 -2.1) (end 3.55 -2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.55 -2.1) (end 3.55 2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.55 2.1) (end -3.55 2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.797369 -2.21) (end 0.797369 -2.21) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.797369 2.21) (end 0.797369 2.21) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.28 2.48) (end -4.28 -2.48) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.28 -2.48) (end 4.28 -2.48) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.28 -2.48) (end 4.28 2.48) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.28 2.48) (end -4.28 2.48) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.5125 0) (size 3.025 4.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.082645))
-  (pad 2 smd roundrect (at 2.5125 0) (size 3.025 4.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.082645))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_2816_7142Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
deleted file mode 100644
index 24f9b447607..00000000000
--- a/Capacitor_SMD.pretty/C_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module C_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5B341556)
-  (descr "Capacitor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
-  (tags "capacitor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -3.18) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value C_2816_7142Metric_Pad3.20x4.45mm_HandSolder (at 0 3.18) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -3.55 2.1) (end -3.55 -2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -3.55 -2.1) (end 3.55 -2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.55 -2.1) (end 3.55 2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.55 2.1) (end -3.55 2.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.797369 -2.21) (end 0.797369 -2.21) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.797369 2.21) (end 0.797369 2.21) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.45 2.48) (end -4.45 -2.48) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.45 -2.48) (end 4.45 -2.48) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.45 -2.48) (end 4.45 2.48) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.45 2.48) (end -4.45 2.48) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.6 0) (size 3.2 4.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.078125))
-  (pad 2 smd roundrect (at 2.6 0) (size 3.2 4.45) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.078125))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_2816_7142Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Capacitor_SMD.pretty/C_3640_9110Metric.kicad_mod b/Capacitor_SMD.pretty/C_3640_9110Metric.kicad_mod
index 4702ff0c239..2e39acdd275 100644
--- a/Capacitor_SMD.pretty/C_3640_9110Metric.kicad_mod
+++ b/Capacitor_SMD.pretty/C_3640_9110Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module C_3640_9110Metric (layer F.Cu) (tedit 5B301BBE)
+(module C_3640_9110Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Capacitor SMD 3640 (9110 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
   (tags capacitor)
   (attr smd)
diff --git a/Capacitor_SMD.pretty/C_3640_9110Metric_Pad2.10x10.45mm_HandSolder.kicad_mod b/Capacitor_SMD.pretty/C_3640_9110Metric_Pad2.10x10.45mm_HandSolder.kicad_mod
index faa0a994bd9..6db75ebf01b 100644
--- a/Capacitor_SMD.pretty/C_3640_9110Metric_Pad2.10x10.45mm_HandSolder.kicad_mod
+++ b/Capacitor_SMD.pretty/C_3640_9110Metric_Pad2.10x10.45mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module C_3640_9110Metric_Pad2.10x10.45mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module C_3640_9110Metric_Pad2.10x10.45mm_HandSolder (layer F.Cu) (tedit 5F68FEEF)
   (descr "Capacitor SMD 3640 (9110 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator")
   (tags "capacitor handsolder")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J.kicad_mod
index b68e451c371..a11494a9f95 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-1608-08_AVX-J (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-1608-08_AVX-J (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-J (1608-08 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/48064/_t58_vmn_pt0471_1601.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J_Pad1.25x1.05mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J_Pad1.25x1.05mm_HandSolder.kicad_mod
index 623cfef9aa7..9b5c078a5d9 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J_Pad1.25x1.05mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-08_AVX-J_Pad1.25x1.05mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-1608-08_AVX-J_Pad1.25x1.05mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-1608-08_AVX-J_Pad1.25x1.05mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-J (1608-08 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/48064/_t58_vmn_pt0471_1601.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L.kicad_mod
index c101faa04a3..0e0e65c24d3 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-1608-10_AVX-L (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-1608-10_AVX-L (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-L (1608-10 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/48064/_t58_vmn_pt0471_1601.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L_Pad1.25x1.05mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L_Pad1.25x1.05mm_HandSolder.kicad_mod
index 9b7d5c7f58c..791e559fd73 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L_Pad1.25x1.05mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-1608-10_AVX-L_Pad1.25x1.05mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-1608-10_AVX-L_Pad1.25x1.05mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-1608-10_AVX-L_Pad1.25x1.05mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-L (1608-10 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/48064/_t58_vmn_pt0471_1601.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R.kicad_mod
index 418b59eda3e..3d57f6dc8ac 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-2012-12_Kemet-R (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-2012-12_Kemet-R (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-R (2012-12 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/40182/tmch.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R_Pad1.30x1.05mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R_Pad1.30x1.05mm_HandSolder.kicad_mod
index e1cf5471920..c2bd75c8756 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R_Pad1.30x1.05mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-12_Kemet-R_Pad1.30x1.05mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-2012-12_Kemet-R_Pad1.30x1.05mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-2012-12_Kemet-R_Pad1.30x1.05mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-R (2012-12 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/40182/tmch.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P.kicad_mod
index a556e69976d..27e942685bb 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-2012-15_AVX-P (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-2012-15_AVX-P (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-P (2012-15 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/40182/tmch.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P_Pad1.30x1.05mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P_Pad1.30x1.05mm_HandSolder.kicad_mod
index 7f88de33263..b51343e78a6 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P_Pad1.30x1.05mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-2012-15_AVX-P_Pad1.30x1.05mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-2012-15_AVX-P_Pad1.30x1.05mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-2012-15_AVX-P_Pad1.30x1.05mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-P (2012-15 Metric), IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/40182/tmch.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I.kicad_mod
index 3f84d60311b..9e44ed7ba13 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3216-10_Kemet-I (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-3216-10_Kemet-I (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-I (3216-10 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I_Pad1.58x1.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I_Pad1.58x1.35mm_HandSolder.kicad_mod
index 6d0a001bd9f..17f25d64f6c 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I_Pad1.58x1.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-10_Kemet-I_Pad1.58x1.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3216-10_Kemet-I_Pad1.58x1.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-3216-10_Kemet-I_Pad1.58x1.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-I (3216-10 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S.kicad_mod
index 526de758cf9..f8b6202aa8e 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3216-12_Kemet-S (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-3216-12_Kemet-S (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-S (3216-12 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S_Pad1.58x1.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S_Pad1.58x1.35mm_HandSolder.kicad_mod
index 9d2a8144853..c66a3d5309d 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S_Pad1.58x1.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-12_Kemet-S_Pad1.58x1.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3216-12_Kemet-S_Pad1.58x1.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-3216-12_Kemet-S_Pad1.58x1.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-S (3216-12 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A.kicad_mod
index c11c66e4a2d..140223f7548 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3216-18_Kemet-A (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-3216-18_Kemet-A (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-A (3216-18 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A_Pad1.58x1.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A_Pad1.58x1.35mm_HandSolder.kicad_mod
index 723fe0dca05..b6f67a46612 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A_Pad1.58x1.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3216-18_Kemet-A_Pad1.58x1.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3216-18_Kemet-A_Pad1.58x1.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-3216-18_Kemet-A_Pad1.58x1.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-A (3216-18 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T.kicad_mod
index 62d5635f4f1..45f7eaeed56 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3528-12_Kemet-T (layer F.Cu) (tedit 5B342532)
+(module CP_EIA-3528-12_Kemet-T (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-T (3528-12 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T_Pad1.50x2.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T_Pad1.50x2.35mm_HandSolder.kicad_mod
index 29ff708a942..ece38ac1f7f 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T_Pad1.50x2.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-12_Kemet-T_Pad1.50x2.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3528-12_Kemet-T_Pad1.50x2.35mm_HandSolder (layer F.Cu) (tedit 5B342532)
+(module CP_EIA-3528-12_Kemet-T_Pad1.50x2.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-T (3528-12 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H.kicad_mod
index 7b8b9e3c9f3..023a81346bc 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3528-15_AVX-H (layer F.Cu) (tedit 5B342532)
+(module CP_EIA-3528-15_AVX-H (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-H (3528-15 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H_Pad1.50x2.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H_Pad1.50x2.35mm_HandSolder.kicad_mod
index 894e47b9596..3bb80084c9e 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H_Pad1.50x2.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-15_AVX-H_Pad1.50x2.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3528-15_AVX-H_Pad1.50x2.35mm_HandSolder (layer F.Cu) (tedit 5B342532)
+(module CP_EIA-3528-15_AVX-H_Pad1.50x2.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-H (3528-15 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B.kicad_mod
index 9afbfa17d54..9194153643e 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3528-21_Kemet-B (layer F.Cu) (tedit 5B342532)
+(module CP_EIA-3528-21_Kemet-B (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-B (3528-21 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B_Pad1.50x2.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B_Pad1.50x2.35mm_HandSolder.kicad_mod
index da0ebcf983c..66e6a14a901 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B_Pad1.50x2.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-3528-21_Kemet-B_Pad1.50x2.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-3528-21_Kemet-B_Pad1.50x2.35mm_HandSolder (layer F.Cu) (tedit 5B342532)
+(module CP_EIA-3528-21_Kemet-B_Pad1.50x2.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-B (3528-21 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U.kicad_mod
index e522f3e8c92..0b948438f53 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-6032-15_Kemet-U (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-6032-15_Kemet-U (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-U (6032-15 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U_Pad2.25x2.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U_Pad2.25x2.35mm_HandSolder.kicad_mod
index bad847a82fd..bf3a88339c8 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U_Pad2.25x2.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-15_Kemet-U_Pad2.25x2.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-6032-15_Kemet-U_Pad2.25x2.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-6032-15_Kemet-U_Pad2.25x2.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-U (6032-15 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F.kicad_mod
index 3482ee4ca6e..700f28f95f1 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-6032-20_AVX-F (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-6032-20_AVX-F (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-F (6032-20 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F_Pad2.25x2.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F_Pad2.25x2.35mm_HandSolder.kicad_mod
index 2292160405f..5667b236fae 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F_Pad2.25x2.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-20_AVX-F_Pad2.25x2.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-6032-20_AVX-F_Pad2.25x2.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-6032-20_AVX-F_Pad2.25x2.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-F (6032-20 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C.kicad_mod
index c84490e8cbe..013913872d8 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-6032-28_Kemet-C (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-6032-28_Kemet-C (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-C (6032-28 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C_Pad2.25x2.35mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C_Pad2.25x2.35mm_HandSolder.kicad_mod
index c9c8fb79c27..5a47b65a18e 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C_Pad2.25x2.35mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-6032-28_Kemet-C_Pad2.25x2.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-6032-28_Kemet-C_Pad2.25x2.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-6032-28_Kemet-C_Pad2.25x2.35mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-C (6032-28 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U.kicad_mod
index edd88749ed6..fffffe7e72f 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7132-20_AVX-U (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7132-20_AVX-U (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-U (7132-20 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U_Pad2.72x3.50mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U_Pad2.72x3.50mm_HandSolder.kicad_mod
index 3bd28e878ab..7c27f10478b 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U_Pad2.72x3.50mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-20_AVX-U_Pad2.72x3.50mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7132-20_AVX-U_Pad2.72x3.50mm_HandSolder (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7132-20_AVX-U_Pad2.72x3.50mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-U (7132-20 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C.kicad_mod
index 0b97c23daa1..d704c947f29 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7132-28_AVX-C (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7132-28_AVX-C (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-C (7132-28 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C_Pad2.72x3.50mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C_Pad2.72x3.50mm_HandSolder.kicad_mod
index c6b56bb8d66..46dfc3735c2 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C_Pad2.72x3.50mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7132-28_AVX-C_Pad2.72x3.50mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7132-28_AVX-C_Pad2.72x3.50mm_HandSolder (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7132-28_AVX-C_Pad2.72x3.50mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-C (7132-28 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R.kicad_mod
index 7a85d11dd28..f55fc94d700 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-15_AVX-R (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-15_AVX-R (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-R (7260-15 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod
index 3ddbdd6425f..e726adda817 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-15_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-15_AVX-R_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-15_AVX-R_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-R (7260-15 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M.kicad_mod
index 50242c966ff..2868fd11516 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-20_AVX-M (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-20_AVX-M (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-M (7260-20 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod
index dabd3790cff..690c32b192f 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-20_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-20_AVX-M_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-20_AVX-M_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-M (7260-20 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M.kicad_mod
index 9a35008acba..4048f98b6e0 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-28_AVX-M (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-28_AVX-M (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-M (7260-28 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod
index b1d71df967a..4947e8cf2ea 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-28_AVX-M_Pad2.68x6.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-28_AVX-M_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-28_AVX-M_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-M (7260-28 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R.kicad_mod
index 849066899cf..16a7c5fbc24 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-38_AVX-R (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-38_AVX-R (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-R (7260-38 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod
index ac296b9d486..766390457ee 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7260-38_AVX-R_Pad2.68x6.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7260-38_AVX-R_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5D98AE44)
+(module CP_EIA-7260-38_AVX-R_Pad2.68x6.30mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-R (7260-38 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/F72-F75.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W.kicad_mod
index 1c3408ec3f9..4eafda3b885 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-15_Kemet-W (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-15_Kemet-W (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-W (7343-15 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W_Pad2.25x2.55mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W_Pad2.25x2.55mm_HandSolder.kicad_mod
index 8689e877072..75310b2006a 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W_Pad2.25x2.55mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-15_Kemet-W_Pad2.25x2.55mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-15_Kemet-W_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-15_Kemet-W_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-W (7343-15 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V.kicad_mod
index 010f98ec847..b34035435b2 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-20_Kemet-V (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-20_Kemet-V (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-V (7343-20 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V_Pad2.25x2.55mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V_Pad2.25x2.55mm_HandSolder.kicad_mod
index e6104941e86..d25c262305a 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V_Pad2.25x2.55mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-20_Kemet-V_Pad2.25x2.55mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-20_Kemet-V_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-20_Kemet-V_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-V (7343-20 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N.kicad_mod
index 5d19b602526..4d920678aaf 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-30_AVX-N (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-30_AVX-N (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-N (7343-30 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N_Pad2.25x2.55mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N_Pad2.25x2.55mm_HandSolder.kicad_mod
index d0765e5e2a0..54b2a51e2a7 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N_Pad2.25x2.55mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-30_AVX-N_Pad2.25x2.55mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-30_AVX-N_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-30_AVX-N_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-N (7343-30 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D.kicad_mod
index 07772725b93..1392bc6e23d 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-31_Kemet-D (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-31_Kemet-D (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-D (7343-31 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D_Pad2.25x2.55mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D_Pad2.25x2.55mm_HandSolder.kicad_mod
index 1d3e36ba47d..381bdf50244 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D_Pad2.25x2.55mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-31_Kemet-D_Pad2.25x2.55mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-31_Kemet-D_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-31_Kemet-D_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-D (7343-31 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y.kicad_mod
index 4a68985dce1..8ee24b3aae3 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-40_Kemet-Y (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-40_Kemet-Y (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-Y (7343-40 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y_Pad2.25x2.55mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y_Pad2.25x2.55mm_HandSolder.kicad_mod
index 5aed1fd36b8..b1e935b95c0 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y_Pad2.25x2.55mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-40_Kemet-Y_Pad2.25x2.55mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-40_Kemet-Y_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-40_Kemet-Y_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-Y (7343-40 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X.kicad_mod
index 6b1a0148f22..b22f498555d 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-43_Kemet-X (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-43_Kemet-X (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-X (7343-43 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X_Pad2.25x2.55mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X_Pad2.25x2.55mm_HandSolder.kicad_mod
index e15c6223364..3736b613b70 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X_Pad2.25x2.55mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7343-43_Kemet-X_Pad2.25x2.55mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7343-43_Kemet-X_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7343-43_Kemet-X_Pad2.25x2.55mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-X (7343-43 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E.kicad_mod
index 4e72b02af53..575aca4a57d 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7360-38_Kemet-E (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7360-38_Kemet-E (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-E (7360-38 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E_Pad2.25x4.25mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E_Pad2.25x4.25mm_HandSolder.kicad_mod
index cb51f725394..bd26dbb9206 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E_Pad2.25x4.25mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7360-38_Kemet-E_Pad2.25x4.25mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7360-38_Kemet-E_Pad2.25x4.25mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7360-38_Kemet-E_Pad2.25x4.25mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD Kemet-E (7360-38 Metric), IPC_7351 nominal, (Body size from: http://www.kemet.com/Lists/ProductCatalog/Attachments/253/KEM_TC101_STD.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V.kicad_mod
index 0b545d34301..8154bd1eff0 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7361-38_AVX-V (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7361-38_AVX-V (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-V (7361-38 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/NOS.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V_Pad2.18x3.30mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V_Pad2.18x3.30mm_HandSolder.kicad_mod
index 170c07b896f..b5e48409072 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V_Pad2.18x3.30mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-38_AVX-V_Pad2.18x3.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7361-38_AVX-V_Pad2.18x3.30mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7361-38_AVX-V_Pad2.18x3.30mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-V (7361-38 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/NOS.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U.kicad_mod
index 59782201c5c..19a4f0987d0 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7361-438_AVX-U (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7361-438_AVX-U (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-U (7361-438 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/NOS.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U_Pad2.18x3.30mm_HandSolder.kicad_mod b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U_Pad2.18x3.30mm_HandSolder.kicad_mod
index 2e500cba421..04c4dfacdd8 100644
--- a/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U_Pad2.18x3.30mm_HandSolder.kicad_mod
+++ b/Capacitor_Tantalum_SMD.pretty/CP_EIA-7361-438_AVX-U_Pad2.18x3.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_EIA-7361-438_AVX-U_Pad2.18x3.30mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module CP_EIA-7361-438_AVX-U_Pad2.18x3.30mm_HandSolder (layer F.Cu) (tedit 5EBA9318)
   (descr "Tantalum Capacitor SMD AVX-U (7361-438 Metric), IPC_7351 nominal, (Body size from: http://datasheets.avx.com/NOS.pdf), generated with kicad-footprint-generator")
   (tags "capacitor tantalum")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_01005_0402Metric.kicad_mod b/Diode_SMD.pretty/D_01005_0402Metric.kicad_mod
index 833e6231c28..fefbdcd9fac 100644
--- a/Diode_SMD.pretty/D_01005_0402Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_01005_0402Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_01005_0402Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_01005_0402Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_01005_0402Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_01005_0402Metric_Castellated.kicad_mod
new file mode 100644
index 00000000000..af95d6fe7e5
--- /dev/null
+++ b/Diode_SMD.pretty/D_01005_0402Metric_Castellated.kicad_mod
@@ -0,0 +1,33 @@
+(module D_01005_0402Metric_Castellated (layer F.Cu) (tedit 5F6BBCD0)
+  (descr "Diode SMD 01005 (0402 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
+  (tags "diode castellated")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value D_01005_0402Metric_Castellated (at 0 1.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.11 0) (end -1.06 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.2 0.1) (end -0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 -0.1) (end 0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 -0.1) (end 0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 0.1) (end -0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1 0.1) (end -0.1 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.05 0.35) (end -1.05 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.05 -0.35) (end 1.05 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.05 -0.35) (end 1.05 0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.05 0.35) (end -1.05 0.35) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.375 0) (size 0.67 0.18) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.375 0) (size 0.67 0.18) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.35 0) (size 0.9 0.2) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.35 0) (size 0.9 0.2) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.68) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_01005_0402Metric_Castellated.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..e98ce4fd563
--- /dev/null
+++ b/Diode_SMD.pretty/D_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
@@ -0,0 +1,33 @@
+(module D_01005_0402Metric_Pad0.57x0.30mm_HandSolder (layer F.Cu) (tedit 5F6BBCCF)
+  (descr "Diode SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
+  (tags "diode handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value D_01005_0402Metric_Pad0.57x0.30mm_HandSolder (at 0 1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -0.935 0) (end -0.885 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.2 0.1) (end -0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 -0.1) (end 0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 -0.1) (end 0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 0.1) (end -0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1 0.1) (end -0.1 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.78 0.3) (end -0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.78 -0.3) (end 0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 -0.3) (end 0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 0.3) (end -0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.62) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_01005_0402Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_0201_0603Metric.kicad_mod b/Diode_SMD.pretty/D_0201_0603Metric.kicad_mod
index f07c83cc1b7..fe83f17d63c 100644
--- a/Diode_SMD.pretty/D_0201_0603Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_0201_0603Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0201_0603Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_0201_0603Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_0201_0603Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_0201_0603Metric_Castellated.kicad_mod
new file mode 100644
index 00000000000..1679ab2f092
--- /dev/null
+++ b/Diode_SMD.pretty/D_0201_0603Metric_Castellated.kicad_mod
@@ -0,0 +1,34 @@
+(module D_0201_0603Metric_Castellated (layer F.Cu) (tedit 5F6BBCD0)
+  (descr "Diode SMD 0201 (0603 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
+  (tags "diode castellated")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value D_0201_0603Metric_Castellated (at 0 1.1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.21 0) (end -1.16 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1 0.15) (end -0.1 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.15 0.4) (end -1.15 -0.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.15 -0.4) (end 1.15 -0.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.15 -0.4) (end 1.15 0.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.15 0.4) (end -1.15 0.4) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.45 0) (size 0.71 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.45 0) (size 0.71 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.425 0) (size 0.95 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.425 0) (size 0.95 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.73) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0201_0603Metric_Castellated.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..c1fe3d7620b
--- /dev/null
+++ b/Diode_SMD.pretty/D_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
@@ -0,0 +1,34 @@
+(module D_0201_0603Metric_Pad0.64x0.40mm_HandSolder (layer F.Cu) (tedit 5F6BBBDD)
+  (descr "Diode SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
+  (tags "diode handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value D_0201_0603Metric_Pad0.64x0.40mm_HandSolder (at 0 1.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.035 0) (end -0.985 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1 0.15) (end -0.1 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.88 0.35) (end -0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.88 -0.35) (end 0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 -0.35) (end 0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 0.35) (end -0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.68) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_0402_1005Metric.kicad_mod b/Diode_SMD.pretty/D_0402_1005Metric.kicad_mod
index 5f6daf2068c..301b8f0f2c3 100644
--- a/Diode_SMD.pretty/D_0402_1005Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_0402_1005Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0402_1005Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_0402_1005Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_0402_1005Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_0402_1005Metric_Castellated.kicad_mod
new file mode 100644
index 00000000000..a5e11b70c85
--- /dev/null
+++ b/Diode_SMD.pretty/D_0402_1005Metric_Castellated.kicad_mod
@@ -0,0 +1,32 @@
+(module D_0402_1005Metric_Castellated (layer F.Cu) (tedit 5F6BBCD0)
+  (descr "Diode SMD 0402 (1005 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+  (tags "diode castellated")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.22) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value D_0402_1005Metric_Castellated (at 0 1.22) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.435 0) (end -1.385 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.4 0.25) (end -0.4 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 0.25) (end -0.3 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.38 0.52) (end -1.38 -0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.38 -0.52) (end 1.38 -0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.38 -0.52) (end 1.38 0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.38 0.52) (end -1.38 0.52) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5875 0) (size 1.075 0.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5875 0) (size 1.075 0.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0402_1005Metric_Castellated.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..17b0537c3f1
--- /dev/null
+++ b/Diode_SMD.pretty/D_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
@@ -0,0 +1,32 @@
+(module D_0402_1005Metric_Pad0.77x0.64mm_HandSolder (layer F.Cu) (tedit 5F6BBBDD)
+  (descr "Diode SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+  (tags "diode handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value D_0402_1005Metric_Pad0.77x0.64mm_HandSolder (at 0 1.17) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.265 0) (end -1.215 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.4 0.25) (end -0.4 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 0.25) (end -0.3 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.1 0.47) (end -1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.1 -0.47) (end 1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 -0.47) (end 1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 0.47) (end -1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_0402_1005Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_0603_1608Metric.kicad_mod b/Diode_SMD.pretty/D_0603_1608Metric.kicad_mod
index e8dc189d95d..dbdd51bc58c 100644
--- a/Diode_SMD.pretty/D_0603_1608Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_0603_1608Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0603_1608Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_0603_1608Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_0603_1608Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_0603_1608Metric_Castellated.kicad_mod
index 76efa7c8f2a..ed161ee8f47 100644
--- a/Diode_SMD.pretty/D_0603_1608Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_0603_1608Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0603_1608Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_0603_1608Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 0603 (1608 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
index 6653e6f6eac..eaab0f79ea9 100644
--- a/Diode_SMD.pretty/D_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_0805_2012Metric.kicad_mod b/Diode_SMD.pretty/D_0805_2012Metric.kicad_mod
index 8ef76a2e289..61100c7651d 100644
--- a/Diode_SMD.pretty/D_0805_2012Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_0805_2012Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0805_2012Metric (layer F.Cu) (tedit 5B36C52B)
+(module D_0805_2012Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_0805_2012Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_0805_2012Metric_Castellated.kicad_mod
index 5205d54802b..811a0c18b54 100644
--- a/Diode_SMD.pretty/D_0805_2012Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_0805_2012Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0805_2012Metric_Castellated (layer F.Cu) (tedit 5B36C52B)
+(module D_0805_2012Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 0805 (2012 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
index b9798364df2..b02b82570cb 100644
--- a/Diode_SMD.pretty/D_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1206_3216Metric.kicad_mod b/Diode_SMD.pretty/D_1206_3216Metric.kicad_mod
index 66e4ead656d..b20a125bbbc 100644
--- a/Diode_SMD.pretty/D_1206_3216Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_1206_3216Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1206_3216Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_1206_3216Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1206_3216Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_1206_3216Metric_Castellated.kicad_mod
index d8ac78934fb..dd3069b4f7c 100644
--- a/Diode_SMD.pretty/D_1206_3216Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_1206_3216Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1206_3216Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_1206_3216Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 1206 (3216 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
index 08cd3eea2f2..60638d14593 100644
--- a/Diode_SMD.pretty/D_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1210_3225Metric.kicad_mod b/Diode_SMD.pretty/D_1210_3225Metric.kicad_mod
index d24542db844..5416368cc77 100644
--- a/Diode_SMD.pretty/D_1210_3225Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_1210_3225Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1210_3225Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_1210_3225Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1210_3225Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_1210_3225Metric_Castellated.kicad_mod
index 5b9113482f6..aeea9024302 100644
--- a/Diode_SMD.pretty/D_1210_3225Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_1210_3225Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1210_3225Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_1210_3225Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 1210 (3225 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
index c08af3b8028..a005905a5cf 100644
--- a/Diode_SMD.pretty/D_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1806_4516Metric.kicad_mod b/Diode_SMD.pretty/D_1806_4516Metric.kicad_mod
deleted file mode 100644
index 966fabee06a..00000000000
--- a/Diode_SMD.pretty/D_1806_4516Metric.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(module D_1806_4516Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Diode SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags diode)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value D_1806_4516Metric (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start 2.25 -0.8) (end -1.85 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.85 -0.8) (end -2.25 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.4) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -1.16) (end -2.96 -1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.96 -1.16) (end -2.96 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.96 1.16) (end 2.25 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.95 1.15) (end -2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.95 -1.15) (end 2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 -1.15) (end 2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 1.15) (end -2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (pad 2 smd roundrect (at 2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_1806_4516Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_1806_4516Metric_Castellated.kicad_mod
deleted file mode 100644
index cbd801c5131..00000000000
--- a/Diode_SMD.pretty/D_1806_4516Metric_Castellated.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(module D_1806_4516Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
-  (descr "Diode SMD 1806 (4516 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "diode castellated")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.8) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value D_1806_4516Metric_Castellated (at 0 1.8) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start 2.25 -0.8) (end -1.85 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.85 -0.8) (end -2.25 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.4) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -1.11) (end -3.16 -1.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.16 -1.11) (end -3.16 1.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.16 1.11) (end 2.25 1.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.15 1.1) (end -3.15 -1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.15 -1.1) (end 3.15 -1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 -1.1) (end 3.15 1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 1.1) (end -3.15 1.1) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.025 0) (size 1.75 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
-  (pad 2 smd roundrect (at 2.025 0) (size 1.75 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1806_4516Metric_Castellated.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
deleted file mode 100644
index a64efbaa8ec..00000000000
--- a/Diode_SMD.pretty/D_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(module D_1806_4516Metric_Pad1.57x1.80mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
-  (descr "Diode SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "diode handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value D_1806_4516Metric_Pad1.57x1.80mm_HandSolder (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start 2.25 -0.8) (end -1.85 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.85 -0.8) (end -2.25 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.4) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -1.16) (end -3.135 -1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.135 -1.16) (end -3.135 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.135 1.16) (end 2.25 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.12 1.15) (end -3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.12 -1.15) (end 3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 -1.15) (end 3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 1.15) (end -3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (pad 2 smd roundrect (at 2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Diode_SMD.pretty/D_1812_4532Metric.kicad_mod b/Diode_SMD.pretty/D_1812_4532Metric.kicad_mod
index 0a777ff4744..33fa4b620cc 100644
--- a/Diode_SMD.pretty/D_1812_4532Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_1812_4532Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1812_4532Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_1812_4532Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1812_4532Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_1812_4532Metric_Castellated.kicad_mod
index d4d2df10961..c9beb678ac8 100644
--- a/Diode_SMD.pretty/D_1812_4532Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_1812_4532Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1812_4532Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_1812_4532Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 1812 (4532 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
index ebd6a70d2e4..f93794d1d7f 100644
--- a/Diode_SMD.pretty/D_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2010_5025Metric.kicad_mod b/Diode_SMD.pretty/D_2010_5025Metric.kicad_mod
index c611c689c5d..15529b28137 100644
--- a/Diode_SMD.pretty/D_2010_5025Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_2010_5025Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2010_5025Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_2010_5025Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2010_5025Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_2010_5025Metric_Castellated.kicad_mod
index af6e1c28824..477bac525e7 100644
--- a/Diode_SMD.pretty/D_2010_5025Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_2010_5025Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2010_5025Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_2010_5025Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 2010 (5025 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
index 05a0610d8d1..b2bf42bf6d7 100644
--- a/Diode_SMD.pretty/D_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2114_3652Metric.kicad_mod b/Diode_SMD.pretty/D_2114_3652Metric.kicad_mod
index 4cdd09fac4a..bf268262560 100644
--- a/Diode_SMD.pretty/D_2114_3652Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_2114_3652Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2114_3652Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_2114_3652Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2114 (3652 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/schottky.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2114_3652Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_2114_3652Metric_Castellated.kicad_mod
index a45faae3bd3..121b8ec6aa3 100644
--- a/Diode_SMD.pretty/D_2114_3652Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_2114_3652Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2114_3652Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_2114_3652Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 2114 (3652 Metric), castellated end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/schottky.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2114_3652Metric_Pad1.85x3.75mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_2114_3652Metric_Pad1.85x3.75mm_HandSolder.kicad_mod
index 13f88f5b54d..53105f9a31c 100644
--- a/Diode_SMD.pretty/D_2114_3652Metric_Pad1.85x3.75mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_2114_3652Metric_Pad1.85x3.75mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2114_3652Metric_Pad1.85x3.75mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_2114_3652Metric_Pad1.85x3.75mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2114 (3652 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/schottky.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2512_6332Metric.kicad_mod b/Diode_SMD.pretty/D_2512_6332Metric.kicad_mod
index ce4adf6366c..caa02da9e5c 100644
--- a/Diode_SMD.pretty/D_2512_6332Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_2512_6332Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2512_6332Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_2512_6332Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2512_6332Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_2512_6332Metric_Castellated.kicad_mod
index 9e6a21f9d35..a7e8363ae41 100644
--- a/Diode_SMD.pretty/D_2512_6332Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_2512_6332Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2512_6332Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_2512_6332Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 2512 (6332 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
index 853fa561182..448be70f07f 100644
--- a/Diode_SMD.pretty/D_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2816_7142Metric.kicad_mod b/Diode_SMD.pretty/D_2816_7142Metric.kicad_mod
index 374bea81b9a..d0dd3582924 100644
--- a/Diode_SMD.pretty/D_2816_7142Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_2816_7142Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2816_7142Metric (layer F.Cu) (tedit 5B341557)
+(module D_2816_7142Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2816_7142Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_2816_7142Metric_Castellated.kicad_mod
index 85cebb503c1..8d2a4648e3c 100644
--- a/Diode_SMD.pretty/D_2816_7142Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_2816_7142Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2816_7142Metric_Castellated (layer F.Cu) (tedit 5B341557)
+(module D_2816_7142Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 2816 (7142 Metric), castellated end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
index ec50a2b6940..bbe5e4ae3b7 100644
--- a/Diode_SMD.pretty/D_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_3220_8050Metric.kicad_mod b/Diode_SMD.pretty/D_3220_8050Metric.kicad_mod
index 49ca088bb63..2310dda2083 100644
--- a/Diode_SMD.pretty/D_3220_8050Metric.kicad_mod
+++ b/Diode_SMD.pretty/D_3220_8050Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module D_3220_8050Metric (layer F.Cu) (tedit 5B301BBE)
+(module D_3220_8050Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 3220 (8050 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/schottky.pdf), generated with kicad-footprint-generator")
   (tags diode)
   (attr smd)
diff --git a/Diode_SMD.pretty/D_3220_8050Metric_Castellated.kicad_mod b/Diode_SMD.pretty/D_3220_8050Metric_Castellated.kicad_mod
index 3539ee7c047..de473e0c95c 100644
--- a/Diode_SMD.pretty/D_3220_8050Metric_Castellated.kicad_mod
+++ b/Diode_SMD.pretty/D_3220_8050Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module D_3220_8050Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module D_3220_8050Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Diode SMD 3220 (8050 Metric), castellated end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/schottky.pdf), generated with kicad-footprint-generator")
   (tags "diode castellated")
   (attr smd)
diff --git a/Diode_SMD.pretty/D_3220_8050Metric_Pad2.65x5.15mm_HandSolder.kicad_mod b/Diode_SMD.pretty/D_3220_8050Metric_Pad2.65x5.15mm_HandSolder.kicad_mod
index fc6e479ef45..3b54b07cdc6 100644
--- a/Diode_SMD.pretty/D_3220_8050Metric_Pad2.65x5.15mm_HandSolder.kicad_mod
+++ b/Diode_SMD.pretty/D_3220_8050Metric_Pad2.65x5.15mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module D_3220_8050Metric_Pad2.65x5.15mm_HandSolder (layer F.Cu) (tedit 5B4B45C8)
+(module D_3220_8050Metric_Pad2.65x5.15mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
   (descr "Diode SMD 3220 (8050 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/schottky.pdf), generated with kicad-footprint-generator")
   (tags "diode handsolder")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_01005_0402Metric.kicad_mod b/Fuse.pretty/Fuse_01005_0402Metric.kicad_mod
deleted file mode 100644
index 553488147eb..00000000000
--- a/Fuse.pretty/Fuse_01005_0402Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module Fuse_01005_0402Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Fuse SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value Fuse_01005_0402Metric (at 0 1) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -0.2 0.1) (end -0.2 -0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.2 -0.1) (end 0.2 -0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.2 -0.1) (end 0.2 0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.2 0.1) (end -0.2 0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.6 0.3) (end -0.6 -0.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.6 -0.3) (end 0.6 -0.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.6 -0.3) (end 0.6 0.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.6 0.3) (end -0.6 0.3) (layer F.CrtYd) (width 0.05))
-  (pad "" smd roundrect (at -0.275 0) (size 0.27 0.27) (layers F.Paste) (roundrect_rratio 0.25))
-  (pad "" smd roundrect (at 0.275 0) (size 0.27 0.27) (layers F.Paste) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -0.25 0) (size 0.4 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.25 0) (size 0.4 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
-  (fp_text user %R (at 0 -0.62) (layer F.Fab)
-    (effects (font (size 0.25 0.25) (thickness 0.04)))
-  )
-  (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_01005_0402Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Fuse.pretty/Fuse_0201_0603Metric.kicad_mod b/Fuse.pretty/Fuse_0201_0603Metric.kicad_mod
deleted file mode 100644
index e5fce82d11f..00000000000
--- a/Fuse.pretty/Fuse_0201_0603Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module Fuse_0201_0603Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Fuse SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.05) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value Fuse_0201_0603Metric (at 0 1.05) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-  (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-  (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
-  (fp_text user %R (at 0 -0.68) (layer F.Fab)
-    (effects (font (size 0.25 0.25) (thickness 0.04)))
-  )
-  (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_0201_0603Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Fuse.pretty/Fuse_0402_1005Metric.kicad_mod b/Fuse.pretty/Fuse_0402_1005Metric.kicad_mod
index 8119951ab16..5ec0e947ec9 100644
--- a/Fuse.pretty/Fuse_0402_1005Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_0402_1005Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_0402_1005Metric (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_0402_1005Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_0402_1005Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_0402_1005Metric_Castellated.kicad_mod
new file mode 100644
index 00000000000..67a66d7179d
--- /dev/null
+++ b/Fuse.pretty/Fuse_0402_1005Metric_Castellated.kicad_mod
@@ -0,0 +1,29 @@
+(module Fuse_0402_1005Metric_Castellated (layer F.Cu) (tedit 5F6BBF84)
+  (descr "Fuse SMD 0402 (1005 Metric), castellated end terminal, IPC_7351. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+  (tags "fuse castellated")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.22) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Fuse_0402_1005Metric_Castellated (at 0 1.22) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.38 0.52) (end -1.38 -0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.38 -0.52) (end 1.38 -0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.38 -0.52) (end 1.38 0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.38 0.52) (end -1.38 0.52) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5875 0) (size 1.075 0.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5875 0) (size 1.075 0.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_0402_1005Metric_Castellated.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Fuse.pretty/Fuse_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..abc1e52347d
--- /dev/null
+++ b/Fuse.pretty/Fuse_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module Fuse_0402_1005Metric_Pad0.77x0.64mm_HandSolder (layer F.Cu) (tedit 5F6BBE7A)
+  (descr "Fuse SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+  (tags "fuse handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Fuse_0402_1005Metric_Pad0.77x0.64mm_HandSolder (at 0 1.17) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1002 -0.36) (end 0.1002 -0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.1002 0.36) (end 0.1002 0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.1 0.47) (end -1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.1 -0.47) (end 1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 -0.47) (end 1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 0.47) (end -1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_0402_1005Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Fuse.pretty/Fuse_0603_1608Metric.kicad_mod b/Fuse.pretty/Fuse_0603_1608Metric.kicad_mod
index 5848bf31130..388dfef7b41 100644
--- a/Fuse.pretty/Fuse_0603_1608Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_0603_1608Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_0603_1608Metric (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_0603_1608Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_0603_1608Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_0603_1608Metric_Castellated.kicad_mod
index a771e3b3c50..cba673f7a48 100644
--- a/Fuse.pretty/Fuse_0603_1608Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_0603_1608Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_0603_1608Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_0603_1608Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 0603 (1608 Metric), castellated end terminal, IPC_7351. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
index 2f707d0992c..c7e42d3da61 100644
--- a/Fuse.pretty/Fuse_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_0805_2012Metric.kicad_mod b/Fuse.pretty/Fuse_0805_2012Metric.kicad_mod
index 8f85d429e80..db54cb320bc 100644
--- a/Fuse.pretty/Fuse_0805_2012Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_0805_2012Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_0805_2012Metric (layer F.Cu) (tedit 5B36C52C)
+(module Fuse_0805_2012Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_0805_2012Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_0805_2012Metric_Castellated.kicad_mod
index 75e4fab3aa4..7a54d6cf629 100644
--- a/Fuse.pretty/Fuse_0805_2012Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_0805_2012Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_0805_2012Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_0805_2012Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 0805 (2012 Metric), castellated end terminal, IPC_7351. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
index 51a4490cd18..676c3b24d13 100644
--- a/Fuse.pretty/Fuse_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52C)
+(module Fuse_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_1206_3216Metric.kicad_mod b/Fuse.pretty/Fuse_1206_3216Metric.kicad_mod
index 3b411349a42..e6935a46d93 100644
--- a/Fuse.pretty/Fuse_1206_3216Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_1206_3216Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_1206_3216Metric (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_1206_3216Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_1206_3216Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_1206_3216Metric_Castellated.kicad_mod
index 69b4ee5efcd..721364f74a4 100644
--- a/Fuse.pretty/Fuse_1206_3216Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_1206_3216Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_1206_3216Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_1206_3216Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 1206 (3216 Metric), castellated end terminal, IPC_7351. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
index 4615f136bae..13e80d9f6e8 100644
--- a/Fuse.pretty/Fuse_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_1210_3225Metric.kicad_mod b/Fuse.pretty/Fuse_1210_3225Metric.kicad_mod
index 3a8a1a6aad7..e02c6854aa4 100644
--- a/Fuse.pretty/Fuse_1210_3225Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_1210_3225Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_1210_3225Metric (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_1210_3225Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_1210_3225Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_1210_3225Metric_Castellated.kicad_mod
index c7a78ac04e7..02b7427844a 100644
--- a/Fuse.pretty/Fuse_1210_3225Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_1210_3225Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_1210_3225Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_1210_3225Metric_Castellated (layer F.Cu) (tedit 5F68FEF2)
   (descr "Fuse SMD 1210 (3225 Metric), castellated end terminal, IPC_7351. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
index 46425350870..1caa9a0e591 100644
--- a/Fuse.pretty/Fuse_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_1806_4516Metric.kicad_mod b/Fuse.pretty/Fuse_1806_4516Metric.kicad_mod
deleted file mode 100644
index c9047b7243f..00000000000
--- a/Fuse.pretty/Fuse_1806_4516Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module Fuse_1806_4516Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Fuse SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value Fuse_1806_4516Metric (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.95 1.15) (end -2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.95 -1.15) (end 2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 -1.15) (end 2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 1.15) (end -2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (pad 2 smd roundrect (at 2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Fuse.pretty/Fuse_1806_4516Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_1806_4516Metric_Castellated.kicad_mod
deleted file mode 100644
index cb18772d150..00000000000
--- a/Fuse.pretty/Fuse_1806_4516Metric_Castellated.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module Fuse_1806_4516Metric_Castellated (layer F.Cu) (tedit 5E627E60)
-  (descr "Fuse SMD 1806 (4516 Metric), castellated end terminal, IPC_7351. (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "fuse castellated")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.8) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value Fuse_1806_4516Metric_Castellated (at 0 1.8) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.995031 -0.91) (end 0.995031 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.995031 0.91) (end 0.995031 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.15 1.1) (end -3.15 -1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.15 -1.1) (end 3.15 -1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 -1.1) (end 3.15 1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 1.1) (end -3.15 1.1) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.025 0) (size 1.75 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
-  (pad 2 smd roundrect (at 2.025 0) (size 1.75 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_1806_4516Metric_Castellated.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Fuse.pretty/Fuse_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
deleted file mode 100644
index 647265ee9c9..00000000000
--- a/Fuse.pretty/Fuse_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module Fuse_1806_4516Metric_Pad1.57x1.80mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Fuse SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value Fuse_1806_4516Metric_Pad1.57x1.80mm_HandSolder (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.12 1.15) (end -3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.12 -1.15) (end 3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 -1.15) (end 3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 1.15) (end -3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (pad 2 smd roundrect (at 2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Fuse.pretty/Fuse_1812_4532Metric.kicad_mod b/Fuse.pretty/Fuse_1812_4532Metric.kicad_mod
index db3733b83f3..1aa883ec43c 100644
--- a/Fuse.pretty/Fuse_1812_4532Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_1812_4532Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_1812_4532Metric (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_1812_4532Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -2.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_1812_4532Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_1812_4532Metric_Castellated.kicad_mod
index b14cc396b72..b1c3f86c1e5 100644
--- a/Fuse.pretty/Fuse_1812_4532Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_1812_4532Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_1812_4532Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_1812_4532Metric_Castellated (layer F.Cu) (tedit 5F68FEF2)
   (descr "Fuse SMD 1812 (4532 Metric), castellated end terminal, IPC_7351. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
index dde4a045034..a62ccaf8ceb 100644
--- a/Fuse.pretty/Fuse_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2010_5025Metric.kicad_mod b/Fuse.pretty/Fuse_2010_5025Metric.kicad_mod
index 19d1a00497d..9276be63026 100644
--- a/Fuse.pretty/Fuse_2010_5025Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_2010_5025Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2010_5025Metric (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_2010_5025Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2010_5025Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_2010_5025Metric_Castellated.kicad_mod
index 07b8a58e575..4573931ed1a 100644
--- a/Fuse.pretty/Fuse_2010_5025Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_2010_5025Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_2010_5025Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_2010_5025Metric_Castellated (layer F.Cu) (tedit 5F68FEF2)
   (descr "Fuse SMD 2010 (5025 Metric), castellated end terminal, IPC_7351. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
index e7d28b3c152..f5a05d224c2 100644
--- a/Fuse.pretty/Fuse_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2512_6332Metric.kicad_mod b/Fuse.pretty/Fuse_2512_6332Metric.kicad_mod
index 250a8c3e167..b3127d19562 100644
--- a/Fuse.pretty/Fuse_2512_6332Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_2512_6332Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2512_6332Metric (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_2512_6332Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2512_6332Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_2512_6332Metric_Castellated.kicad_mod
index fdf21dd40a2..de3a4291f00 100644
--- a/Fuse.pretty/Fuse_2512_6332Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_2512_6332Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_2512_6332Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_2512_6332Metric_Castellated (layer F.Cu) (tedit 5F68FEF2)
   (descr "Fuse SMD 2512 (6332 Metric), castellated end terminal, IPC_7351. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
index 6d1408e6568..527cbb63e41 100644
--- a/Fuse.pretty/Fuse_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
+(module Fuse_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2816_7142Metric.kicad_mod b/Fuse.pretty/Fuse_2816_7142Metric.kicad_mod
index c6c31f4a7a3..6dfb31be91b 100644
--- a/Fuse.pretty/Fuse_2816_7142Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_2816_7142Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2816_7142Metric (layer F.Cu) (tedit 5B341557)
+(module Fuse_2816_7142Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -3.18) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2816_7142Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_2816_7142Metric_Castellated.kicad_mod
index 004100e33b6..9af6d97a638 100644
--- a/Fuse.pretty/Fuse_2816_7142Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_2816_7142Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_2816_7142Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_2816_7142Metric_Castellated (layer F.Cu) (tedit 5F68FEF2)
   (descr "Fuse SMD 2816 (7142 Metric), castellated end terminal, IPC_7351. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
index 589ffff6143..fbfae24b801 100644
--- a/Fuse.pretty/Fuse_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5B341557)
+(module Fuse_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -3.18) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2920_7451Metric.kicad_mod b/Fuse.pretty/Fuse_2920_7451Metric.kicad_mod
index ba5175cbb18..c49b9251050 100644
--- a/Fuse.pretty/Fuse_2920_7451Metric.kicad_mod
+++ b/Fuse.pretty/Fuse_2920_7451Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2920_7451Metric (layer F.Cu) (tedit 5B341557)
+(module Fuse_2920_7451Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2920 (7451 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://www.megastar.com/products/fusetronic/polyswitch/PDF/smd2920.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
+  (tags fuse)
   (attr smd)
   (fp_text reference REF** (at 0 -3.68) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Fuse.pretty/Fuse_2920_7451Metric_Castellated.kicad_mod b/Fuse.pretty/Fuse_2920_7451Metric_Castellated.kicad_mod
index 1c5672a17fa..deb5e710cac 100644
--- a/Fuse.pretty/Fuse_2920_7451Metric_Castellated.kicad_mod
+++ b/Fuse.pretty/Fuse_2920_7451Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module Fuse_2920_7451Metric_Castellated (layer F.Cu) (tedit 5E627E60)
+(module Fuse_2920_7451Metric_Castellated (layer F.Cu) (tedit 5F68FEF2)
   (descr "Fuse SMD 2920 (7451 Metric), castellated end terminal, IPC_7351. (Body size from: http://www.megastar.com/products/fusetronic/polyswitch/PDF/smd2920.pdf), generated with kicad-footprint-generator")
   (tags "fuse castellated")
   (attr smd)
diff --git a/Fuse.pretty/Fuse_2920_7451Metric_Pad2.10x5.45mm_HandSolder.kicad_mod b/Fuse.pretty/Fuse_2920_7451Metric_Pad2.10x5.45mm_HandSolder.kicad_mod
index 6ed1b17c209..786f6b1dc5d 100644
--- a/Fuse.pretty/Fuse_2920_7451Metric_Pad2.10x5.45mm_HandSolder.kicad_mod
+++ b/Fuse.pretty/Fuse_2920_7451Metric_Pad2.10x5.45mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module Fuse_2920_7451Metric_Pad2.10x5.45mm_HandSolder (layer F.Cu) (tedit 5B341557)
+(module Fuse_2920_7451Metric_Pad2.10x5.45mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "Fuse SMD 2920 (7451 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://www.megastar.com/products/fusetronic/polyswitch/PDF/smd2920.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
+  (tags "fuse handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -3.68) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/Inductor_SMD.pretty/L_01005_0402Metric.kicad_mod b/Inductor_SMD.pretty/L_01005_0402Metric.kicad_mod
index 3a1812b0604..ec39f36b03f 100644
--- a/Inductor_SMD.pretty/L_01005_0402Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_01005_0402Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_01005_0402Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_01005_0402Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..2ee31c09e48
--- /dev/null
+++ b/Inductor_SMD.pretty/L_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module L_01005_0402Metric_Pad0.57x0.30mm_HandSolder (layer F.Cu) (tedit 5F6BBCCF)
+  (descr "Inductor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
+  (tags "inductor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value L_01005_0402Metric_Pad0.57x0.30mm_HandSolder (at 0 1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.2 0.1) (end -0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 -0.1) (end 0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 -0.1) (end 0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 0.1) (end -0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.78 0.3) (end -0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.78 -0.3) (end 0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 -0.3) (end 0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 0.3) (end -0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.62) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_01005_0402Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_0201_0603Metric.kicad_mod b/Inductor_SMD.pretty/L_0201_0603Metric.kicad_mod
index 0c89d8c7e3a..9fecde98f06 100644
--- a/Inductor_SMD.pretty/L_0201_0603Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_0201_0603Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_0201_0603Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_0201_0603Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..5c2e3006888
--- /dev/null
+++ b/Inductor_SMD.pretty/L_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module L_0201_0603Metric_Pad0.64x0.40mm_HandSolder (layer F.Cu) (tedit 5F6BBB3E)
+  (descr "Inductor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
+  (tags "inductor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value L_0201_0603Metric_Pad0.64x0.40mm_HandSolder (at 0 1.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.88 0.35) (end -0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.88 -0.35) (end 0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 -0.35) (end 0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 0.35) (end -0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.68) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_0201_0603Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_0402_1005Metric.kicad_mod b/Inductor_SMD.pretty/L_0402_1005Metric.kicad_mod
index 4ca24946c76..b142a625630 100644
--- a/Inductor_SMD.pretty/L_0402_1005Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_0402_1005Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_0402_1005Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_0402_1005Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..6e883f72cbf
--- /dev/null
+++ b/Inductor_SMD.pretty/L_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module L_0402_1005Metric_Pad0.77x0.64mm_HandSolder (layer F.Cu) (tedit 5F6BBB3E)
+  (descr "Inductor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+  (tags "inductor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value L_0402_1005Metric_Pad0.77x0.64mm_HandSolder (at 0 1.17) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1002 -0.36) (end 0.1002 -0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.1002 0.36) (end 0.1002 0.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.1 0.47) (end -1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.1 -0.47) (end 1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 -0.47) (end 1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 0.47) (end -1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_0402_1005Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_0603_1608Metric.kicad_mod b/Inductor_SMD.pretty/L_0603_1608Metric.kicad_mod
index 1db04099585..0a53ca5de3e 100644
--- a/Inductor_SMD.pretty/L_0603_1608Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_0603_1608Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_0603_1608Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_0603_1608Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
index 44fae5e5970..825e5d79a5b 100644
--- a/Inductor_SMD.pretty/L_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module L_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
diff --git a/Inductor_SMD.pretty/L_0805_2012Metric.kicad_mod b/Inductor_SMD.pretty/L_0805_2012Metric.kicad_mod
index 1c46c3349de..dbda8884846 100644
--- a/Inductor_SMD.pretty/L_0805_2012Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_0805_2012Metric.kicad_mod
@@ -1,25 +1,25 @@
-(module L_0805_2012Metric (layer F.Cu) (tedit 5B36C52B)
-  (descr "Inductor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+(module L_0805_2012Metric (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 80, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
-  (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -1.55) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value L_0805_2012Metric (at 0 1.65) (layer F.Fab)
+  (fp_text value L_0805_2012Metric (at 0 1.55) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_line (start -1 0.45) (end -1 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -0.45) (end 1 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -0.45) (end 1 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 0.45) (end -1 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.399622 -0.56) (end 0.399622 -0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.399622 0.56) (end 0.399622 0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.75 0.85) (end -1.75 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.75 -0.85) (end 1.75 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.75 -0.85) (end 1.75 0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.75 0.85) (end -1.75 0.85) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.0625 0) (size 0.875 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 1.0625 0) (size 0.875 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
diff --git a/Inductor_SMD.pretty/L_0805_2012Metric_Pad1.05x1.20mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_0805_2012Metric_Pad1.05x1.20mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..4b7b96b0393
--- /dev/null
+++ b/Inductor_SMD.pretty/L_0805_2012Metric_Pad1.05x1.20mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module L_0805_2012Metric_Pad1.05x1.20mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 80, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "inductor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.55) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value L_0805_2012Metric_Pad1.05x1.20mm_HandSolder (at 0 1.55) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1 0.45) (end -1 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -0.45) (end 1 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -0.45) (end 1 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 0.45) (end -1 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.410242 -0.56) (end 0.410242 -0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.410242 0.56) (end 0.410242 0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.92 0.85) (end -1.92 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.92 -0.85) (end 1.92 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.92 -0.85) (end 1.92 0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.92 0.85) (end -1.92 0.85) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.15 0) (size 1.05 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
+  (pad 2 smd roundrect (at 1.15 0) (size 1.05 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.5 0.5) (thickness 0.08)))
+  )
+  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_0805_2012Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
index 28358bdc186..fb8069ce1d3 100644
--- a/Inductor_SMD.pretty/L_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B)
-  (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+(module L_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
diff --git a/Inductor_SMD.pretty/L_1008_2520Metric.kicad_mod b/Inductor_SMD.pretty/L_1008_2520Metric.kicad_mod
index ce4b5edb06c..3c488737986 100644
--- a/Inductor_SMD.pretty/L_1008_2520Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_1008_2520Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_1008_2520Metric (layer F.Cu) (tedit 5D4AF589)
+(module L_1008_2520Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 1008 (2520 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://ecsxtal.com/store/pdf/ECS-MPI2520-SMD-POWER-INDUCTOR.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_1008_2520Metric_Pad1.43x2.20mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_1008_2520Metric_Pad1.43x2.20mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..eb50312ce8d
--- /dev/null
+++ b/Inductor_SMD.pretty/L_1008_2520Metric_Pad1.43x2.20mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module L_1008_2520Metric_Pad1.43x2.20mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1008 (2520 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://ecsxtal.com/store/pdf/ECS-MPI2520-SMD-POWER-INDUCTOR.pdf), generated with kicad-footprint-generator")
+  (tags "inductor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -2.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value L_1008_2520Metric_Pad1.43x2.20mm_HandSolder (at 0 2.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.25 1) (end -1.25 -1) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.25 -1) (end 1.25 -1) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.25 -1) (end 1.25 1) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.25 1) (end -1.25 1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.261252 -1.11) (end 0.261252 -1.11) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.261252 1.11) (end 0.261252 1.11) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.12 1.35) (end -2.12 -1.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.12 -1.35) (end 2.12 -1.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.12 -1.35) (end 2.12 1.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.12 1.35) (end -2.12 1.35) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.1625 0) (size 1.425 2.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
+  (pad 2 smd roundrect (at 1.1625 0) (size 1.425 2.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.62 0.62) (thickness 0.09)))
+  )
+  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1008_2520Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_1206_3216Metric.kicad_mod b/Inductor_SMD.pretty/L_1206_3216Metric.kicad_mod
index d1209026ffc..e8a5da63d5a 100644
--- a/Inductor_SMD.pretty/L_1206_3216Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_1206_3216Metric.kicad_mod
@@ -1,25 +1,25 @@
-(module L_1206_3216Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Inductor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module L_1206_3216Metric (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 80, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
-  (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -1.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value L_1206_3216Metric (at 0 1.82) (layer F.Fab)
+  (fp_text value L_1206_3216Metric (at 0 1.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
   (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -0.91) (end 0.602064 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 0.91) (end 0.602064 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.28 1.12) (end -2.28 -1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.28 -1.12) (end 2.28 -1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.28 -1.12) (end 2.28 1.12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.28 1.12) (end -2.28 1.12) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4 0) (size 1.25 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
-  (pad 2 smd roundrect (at 1.4 0) (size 1.25 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
+  (fp_line (start -0.835242 -0.91) (end 0.835242 -0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.835242 0.91) (end 0.835242 0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.35 1.2) (end -2.35 -1.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.35 -1.2) (end 2.35 -1.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.35 -1.2) (end 2.35 1.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.35 1.2) (end -2.35 1.2) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.575 0) (size 1.05 1.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
+  (pad 2 smd roundrect (at 1.575 0) (size 1.05 1.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.238095))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
diff --git a/Inductor_SMD.pretty/L_1206_3216Metric_Pad1.22x1.90mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_1206_3216Metric_Pad1.22x1.90mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..8fd4c09595a
--- /dev/null
+++ b/Inductor_SMD.pretty/L_1206_3216Metric_Pad1.22x1.90mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module L_1206_3216Metric_Pad1.22x1.90mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 80, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "inductor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.9) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value L_1206_3216Metric_Pad1.22x1.90mm_HandSolder (at 0 1.9) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.835242 -0.91) (end 0.835242 -0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.835242 0.91) (end 0.835242 0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.52 1.2) (end -2.52 -1.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.52 -1.2) (end 2.52 -1.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.52 -1.2) (end 2.52 1.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.52 1.2) (end -2.52 1.2) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.6625 0) (size 1.225 1.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.204082))
+  (pad 2 smd roundrect (at 1.6625 0) (size 1.225 1.9) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.204082))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.8 0.8) (thickness 0.12)))
+  )
+  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1206_3216Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
index 86ef3cd2b0c..8e166d9f539 100644
--- a/Inductor_SMD.pretty/L_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module L_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
diff --git a/Inductor_SMD.pretty/L_1210_3225Metric.kicad_mod b/Inductor_SMD.pretty/L_1210_3225Metric.kicad_mod
index ac787789e98..337a6a9c750 100644
--- a/Inductor_SMD.pretty/L_1210_3225Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_1210_3225Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_1210_3225Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_1210_3225Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
index 028adc69d29..849e53a68b9 100644
--- a/Inductor_SMD.pretty/L_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module L_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
diff --git a/Inductor_SMD.pretty/L_1806_4516Metric.kicad_mod b/Inductor_SMD.pretty/L_1806_4516Metric.kicad_mod
index 2e87a3f8809..5c736be14d5 100644
--- a/Inductor_SMD.pretty/L_1806_4516Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_1806_4516Metric.kicad_mod
@@ -1,25 +1,25 @@
-(module L_1806_4516Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "Inductor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
+(module L_1806_4516Metric (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 80, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -1.55) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value L_1806_4516Metric (at 0 1.85) (layer F.Fab)
+  (fp_text value L_1806_4516Metric (at 0 1.55) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.95 1.15) (end -2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.95 -1.15) (end 2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 -1.15) (end 2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 1.15) (end -2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (pad 2 smd roundrect (at 2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
+  (fp_line (start -2.25 0.45) (end -2.25 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.25 -0.45) (end 2.25 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 -0.45) (end 2.25 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 0.45) (end -2.25 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.260242 -0.56) (end 1.260242 -0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.260242 0.56) (end 1.260242 0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 0.85) (end -3 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3 -0.85) (end 3 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 -0.85) (end 3 0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 0.85) (end -3 0.85) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -2.1125 0) (size 1.275 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad 2 smd roundrect (at 2.1125 0) (size 1.275 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Inductor_SMD.pretty/L_1806_4516Metric_Pad1.45x1.20mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_1806_4516Metric_Pad1.45x1.20mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..3cb3779de92
--- /dev/null
+++ b/Inductor_SMD.pretty/L_1806_4516Metric_Pad1.45x1.20mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module L_1806_4516Metric_Pad1.45x1.20mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 80, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "inductor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.55) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value L_1806_4516Metric_Pad1.45x1.20mm_HandSolder (at 0 1.55) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.25 0.45) (end -2.25 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.25 -0.45) (end 2.25 -0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 -0.45) (end 2.25 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.25 0.45) (end -2.25 0.45) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.260242 -0.56) (end 1.260242 -0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.260242 0.56) (end 1.260242 0.56) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.18 0.85) (end -3.18 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.18 -0.85) (end 3.18 -0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.18 -0.85) (end 3.18 0.85) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.18 0.85) (end -3.18 0.85) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -2.2 0) (size 1.45 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad 2 smd roundrect (at 2.2 0) (size 1.45 1.2) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1806_4516Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
deleted file mode 100644
index 0c2c5c40419..00000000000
--- a/Inductor_SMD.pretty/L_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module L_1806_4516Metric_Pad1.57x1.80mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "inductor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value L_1806_4516Metric_Pad1.57x1.80mm_HandSolder (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.12 1.15) (end -3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.12 -1.15) (end 3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 -1.15) (end 3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 1.15) (end -3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (pad 2 smd roundrect (at 2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Inductor_SMD.pretty/L_1812_4532Metric.kicad_mod b/Inductor_SMD.pretty/L_1812_4532Metric.kicad_mod
index 3b0177eb26b..35a3081777a 100644
--- a/Inductor_SMD.pretty/L_1812_4532Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_1812_4532Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_1812_4532Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_1812_4532Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
index aa6309eb719..09147ae6783 100644
--- a/Inductor_SMD.pretty/L_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
+(module L_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.65) (layer F.SilkS)
diff --git a/Inductor_SMD.pretty/L_2010_5025Metric.kicad_mod b/Inductor_SMD.pretty/L_2010_5025Metric.kicad_mod
index 00588d522ec..d1dcc3cee36 100644
--- a/Inductor_SMD.pretty/L_2010_5025Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_2010_5025Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_2010_5025Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_2010_5025Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
index 7129c58409c..7180040baf9 100644
--- a/Inductor_SMD.pretty/L_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module L_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
diff --git a/Inductor_SMD.pretty/L_2512_6332Metric.kicad_mod b/Inductor_SMD.pretty/L_2512_6332Metric.kicad_mod
index 01f91b91828..856eb846728 100644
--- a/Inductor_SMD.pretty/L_2512_6332Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_2512_6332Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_2512_6332Metric (layer F.Cu) (tedit 5B301BBE)
+(module L_2512_6332Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
index 6f2412dc6fd..4d72e5db3f1 100644
--- a/Inductor_SMD.pretty/L_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5B301BBE)
-  (descr "Capacitor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module L_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
diff --git a/Inductor_SMD.pretty/L_2816_7142Metric.kicad_mod b/Inductor_SMD.pretty/L_2816_7142Metric.kicad_mod
index 14e4a05a0cc..0125a916f1d 100644
--- a/Inductor_SMD.pretty/L_2816_7142Metric.kicad_mod
+++ b/Inductor_SMD.pretty/L_2816_7142Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module L_2816_7142Metric (layer F.Cu) (tedit 5B341557)
+(module L_2816_7142Metric (layer F.Cu) (tedit 5F68FEF0)
   (descr "Inductor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags inductor)
   (attr smd)
diff --git a/Inductor_SMD.pretty/L_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod b/Inductor_SMD.pretty/L_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
index 731596dd038..0fe35e7ff69 100644
--- a/Inductor_SMD.pretty/L_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
+++ b/Inductor_SMD.pretty/L_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
@@ -1,5 +1,5 @@
-(module L_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5B341557)
-  (descr "Capacitor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
+(module L_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5F68FEF0)
+  (descr "Inductor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "inductor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -3.18) (layer F.SilkS)
diff --git a/LED_SMD.pretty/LED_01005_0402Metric.kicad_mod b/LED_SMD.pretty/LED_01005_0402Metric.kicad_mod
deleted file mode 100644
index e433d33fecb..00000000000
--- a/LED_SMD.pretty/LED_01005_0402Metric.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(module LED_01005_0402Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "LED SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
-  (tags LED)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value LED_01005_0402Metric (at 0 1) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_circle (center -0.76 0) (end -0.71 0) (layer F.SilkS) (width 0.1))
-  (fp_line (start -0.2 0.1) (end -0.2 -0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.2 -0.1) (end 0.2 -0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.2 -0.1) (end 0.2 0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.2 0.1) (end -0.2 0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.1 0.1) (end -0.1 -0.1) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.6 0.3) (end -0.6 -0.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.6 -0.3) (end 0.6 -0.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.6 -0.3) (end 0.6 0.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.6 0.3) (end -0.6 0.3) (layer F.CrtYd) (width 0.05))
-  (pad "" smd roundrect (at -0.275 0) (size 0.27 0.27) (layers F.Paste) (roundrect_rratio 0.25))
-  (pad "" smd roundrect (at 0.275 0) (size 0.27 0.27) (layers F.Paste) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -0.25 0) (size 0.4 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.25 0) (size 0.4 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
-  (fp_text user %R (at 0 -0.62) (layer F.Fab)
-    (effects (font (size 0.25 0.25) (thickness 0.04)))
-  )
-  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_01005_0402Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_0201_0603Metric.kicad_mod b/LED_SMD.pretty/LED_0201_0603Metric.kicad_mod
index 65b0a2ce449..72cb5ea2c1c 100644
--- a/LED_SMD.pretty/LED_0201_0603Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_0201_0603Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_0201_0603Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_0201_0603Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
   (tags LED)
   (attr smd)
diff --git a/LED_SMD.pretty/LED_0201_0603Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_0201_0603Metric_Castellated.kicad_mod
new file mode 100644
index 00000000000..20d10c29ec5
--- /dev/null
+++ b/LED_SMD.pretty/LED_0201_0603Metric_Castellated.kicad_mod
@@ -0,0 +1,34 @@
+(module LED_0201_0603Metric_Castellated (layer F.Cu) (tedit 5F6BBF83)
+  (descr "LED SMD 0201 (0603 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
+  (tags "LED castellated")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value LED_0201_0603Metric_Castellated (at 0 1.1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.21 0) (end -1.16 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1 0.15) (end -0.1 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.15 0.4) (end -1.15 -0.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.15 -0.4) (end 1.15 -0.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.15 -0.4) (end 1.15 0.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.15 0.4) (end -1.15 0.4) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.45 0) (size 0.71 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.45 0) (size 0.71 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.425 0) (size 0.95 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.425 0) (size 0.95 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.73) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0201_0603Metric_Castellated.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..ae2b52329bd
--- /dev/null
+++ b/LED_SMD.pretty/LED_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
@@ -0,0 +1,34 @@
+(module LED_0201_0603Metric_Pad0.64x0.40mm_HandSolder (layer F.Cu) (tedit 5F6BBF83)
+  (descr "LED SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
+  (tags "LED handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value LED_0201_0603Metric_Pad0.64x0.40mm_HandSolder (at 0 1.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.035 0) (end -0.985 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.1 0.15) (end -0.1 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.88 0.35) (end -0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.88 -0.35) (end 0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 -0.35) (end 0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 0.35) (end -0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.68) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0201_0603Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_0402_1005Metric.kicad_mod b/LED_SMD.pretty/LED_0402_1005Metric.kicad_mod
index fef76adc3ed..e5ffbdfb4ac 100644
--- a/LED_SMD.pretty/LED_0402_1005Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_0402_1005Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_0402_1005Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_0402_1005Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags LED)
   (attr smd)
diff --git a/LED_SMD.pretty/LED_0402_1005Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_0402_1005Metric_Castellated.kicad_mod
new file mode 100644
index 00000000000..1133a91acd7
--- /dev/null
+++ b/LED_SMD.pretty/LED_0402_1005Metric_Castellated.kicad_mod
@@ -0,0 +1,32 @@
+(module LED_0402_1005Metric_Castellated (layer F.Cu) (tedit 5F6BBF83)
+  (descr "LED SMD 0402 (1005 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+  (tags "LED castellated")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.22) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value LED_0402_1005Metric_Castellated (at 0 1.22) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.435 0) (end -1.385 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.4 0.25) (end -0.4 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 0.25) (end -0.3 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.38 0.52) (end -1.38 -0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.38 -0.52) (end 1.38 -0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.38 -0.52) (end 1.38 0.52) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.38 0.52) (end -1.38 0.52) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5875 0) (size 1.075 0.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5875 0) (size 1.075 0.55) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0402_1005Metric_Castellated.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..10f45095705
--- /dev/null
+++ b/LED_SMD.pretty/LED_0402_1005Metric_Pad0.77x0.64mm_HandSolder.kicad_mod
@@ -0,0 +1,32 @@
+(module LED_0402_1005Metric_Pad0.77x0.64mm_HandSolder (layer F.Cu) (tedit 5F6BBF83)
+  (descr "LED SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+  (tags "LED handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value LED_0402_1005Metric_Pad0.77x0.64mm_HandSolder (at 0 1.17) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center -1.265 0) (end -1.215 0) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.4 0.25) (end -0.4 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 0.25) (end -0.3 -0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.1 0.47) (end -1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.1 -0.47) (end 1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 -0.47) (end 1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 0.47) (end -1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5725 0) (size 0.765 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0402_1005Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_0603_1608Metric.kicad_mod b/LED_SMD.pretty/LED_0603_1608Metric.kicad_mod
index 650a190ff43..757f1c7c51a 100644
--- a/LED_SMD.pretty/LED_0603_1608Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_0603_1608Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_0603_1608Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_0603_1608Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_0603_1608Metric_Castellated.kicad_mod
index b7287e901cf..da02b60bf5b 100644
--- a/LED_SMD.pretty/LED_0603_1608Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_0603_1608Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_0603_1608Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module LED_0603_1608Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0603 (1608 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
index fae193bcbdf..09c57571e66 100644
--- a/LED_SMD.pretty/LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_0805_2012Metric.kicad_mod b/LED_SMD.pretty/LED_0805_2012Metric.kicad_mod
index b54744f20b5..999d4cbb1f4 100644
--- a/LED_SMD.pretty/LED_0805_2012Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_0805_2012Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_0805_2012Metric (layer F.Cu) (tedit 5B36C52C)
+(module LED_0805_2012Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_0805_2012Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_0805_2012Metric_Castellated.kicad_mod
index 03e44932d2e..4eebd2a778e 100644
--- a/LED_SMD.pretty/LED_0805_2012Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_0805_2012Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_0805_2012Metric_Castellated (layer F.Cu) (tedit 5B36C52C)
+(module LED_0805_2012Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0805 (2012 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
index 36264703085..9e84e2539ed 100644
--- a/LED_SMD.pretty/LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_1206_3216Metric.kicad_mod b/LED_SMD.pretty/LED_1206_3216Metric.kicad_mod
index b1bcc6807dc..371fcf613ba 100644
--- a/LED_SMD.pretty/LED_1206_3216Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_1206_3216Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_1206_3216Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_1206_3216Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_1206_3216Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_1206_3216Metric_Castellated.kicad_mod
index e8d87e54cd9..9c84fe5f792 100644
--- a/LED_SMD.pretty/LED_1206_3216Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_1206_3216Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_1206_3216Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module LED_1206_3216Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1206 (3216 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
index b126814a423..c1cd190ca70 100644
--- a/LED_SMD.pretty/LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_1210_3225Metric.kicad_mod b/LED_SMD.pretty/LED_1210_3225Metric.kicad_mod
index 750b6d72b42..42c4313fdf6 100644
--- a/LED_SMD.pretty/LED_1210_3225Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_1210_3225Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_1210_3225Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_1210_3225Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_1210_3225Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_1210_3225Metric_Castellated.kicad_mod
index 199de856be1..e589ac5202e 100644
--- a/LED_SMD.pretty/LED_1210_3225Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_1210_3225Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_1210_3225Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module LED_1210_3225Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1210 (3225 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
index 052e5a5407f..26d0b35e9c0 100644
--- a/LED_SMD.pretty/LED_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_1806_4516Metric.kicad_mod b/LED_SMD.pretty/LED_1806_4516Metric.kicad_mod
deleted file mode 100644
index 56e0cca2480..00000000000
--- a/LED_SMD.pretty/LED_1806_4516Metric.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(module LED_1806_4516Metric (layer F.Cu) (tedit 5B301BBE)
-  (descr "LED SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags diode)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value LED_1806_4516Metric (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start 2.25 -0.8) (end -1.85 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.85 -0.8) (end -2.25 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.4) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -1.16) (end -2.96 -1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.96 -1.16) (end -2.96 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.96 1.16) (end 2.25 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.95 1.15) (end -2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.95 -1.15) (end 2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 -1.15) (end 2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 1.15) (end -2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (pad 2 smd roundrect (at 2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_1806_4516Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_1806_4516Metric_Castellated.kicad_mod
deleted file mode 100644
index 688492730db..00000000000
--- a/LED_SMD.pretty/LED_1806_4516Metric_Castellated.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(module LED_1806_4516Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
-  (descr "LED SMD 1806 (4516 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "LED castellated")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.8) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value LED_1806_4516Metric_Castellated (at 0 1.8) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start 2.25 -0.8) (end -1.85 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.85 -0.8) (end -2.25 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.4) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -1.11) (end -3.16 -1.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.16 -1.11) (end -3.16 1.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.16 1.11) (end 2.25 1.11) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.15 1.1) (end -3.15 -1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.15 -1.1) (end 3.15 -1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 -1.1) (end 3.15 1.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.15 1.1) (end -3.15 1.1) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.025 0) (size 1.75 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
-  (pad 2 smd roundrect (at 2.025 0) (size 1.75 1.7) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.147059))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_1806_4516Metric_Castellated.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
deleted file mode 100644
index 39cde3bfbd8..00000000000
--- a/LED_SMD.pretty/LED_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(module LED_1806_4516Metric_Pad1.57x1.80mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
-  (descr "LED SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "LED handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value LED_1806_4516Metric_Pad1.57x1.80mm_HandSolder (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start 2.25 -0.8) (end -1.85 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.85 -0.8) (end -2.25 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.4) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -1.16) (end -3.135 -1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.135 -1.16) (end -3.135 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.135 1.16) (end 2.25 1.16) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.12 1.15) (end -3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.12 -1.15) (end 3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 -1.15) (end 3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 1.15) (end -3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (pad 2 smd roundrect (at 2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/LED_SMD.pretty/LED_1812_4532Metric.kicad_mod b/LED_SMD.pretty/LED_1812_4532Metric.kicad_mod
index cdc5ed66589..dbc50bc6be4 100644
--- a/LED_SMD.pretty/LED_1812_4532Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_1812_4532Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_1812_4532Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_1812_4532Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -2.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_1812_4532Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_1812_4532Metric_Castellated.kicad_mod
index ec1dd592eba..08a23482bf0 100644
--- a/LED_SMD.pretty/LED_1812_4532Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_1812_4532Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_1812_4532Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module LED_1812_4532Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1812 (4532 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
index 914a3daa837..c1006f37285 100644
--- a/LED_SMD.pretty/LED_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_2010_5025Metric.kicad_mod b/LED_SMD.pretty/LED_2010_5025Metric.kicad_mod
index 4ce40e8fe35..6c30d77d099 100644
--- a/LED_SMD.pretty/LED_2010_5025Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_2010_5025Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_2010_5025Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_2010_5025Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_2010_5025Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_2010_5025Metric_Castellated.kicad_mod
index 9404e9bb1f8..03feb52fa10 100644
--- a/LED_SMD.pretty/LED_2010_5025Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_2010_5025Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_2010_5025Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module LED_2010_5025Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2010 (5025 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
index 16c17237af5..cfef6b95077 100644
--- a/LED_SMD.pretty/LED_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_2512_6332Metric.kicad_mod b/LED_SMD.pretty/LED_2512_6332Metric.kicad_mod
index b17c0f7f519..7deac6cdc92 100644
--- a/LED_SMD.pretty/LED_2512_6332Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_2512_6332Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_2512_6332Metric (layer F.Cu) (tedit 5B301BBE)
+(module LED_2512_6332Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_2512_6332Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_2512_6332Metric_Castellated.kicad_mod
index 1af2880648f..2a4b171fa60 100644
--- a/LED_SMD.pretty/LED_2512_6332Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_2512_6332Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_2512_6332Metric_Castellated (layer F.Cu) (tedit 5B301BBE)
+(module LED_2512_6332Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2512 (6332 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
index 1f05045295b..6c21a2e3630 100644
--- a/LED_SMD.pretty/LED_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_2816_7142Metric.kicad_mod b/LED_SMD.pretty/LED_2816_7142Metric.kicad_mod
index a7c223a2e33..32e2d152645 100644
--- a/LED_SMD.pretty/LED_2816_7142Metric.kicad_mod
+++ b/LED_SMD.pretty/LED_2816_7142Metric.kicad_mod
@@ -1,6 +1,6 @@
-(module LED_2816_7142Metric (layer F.Cu) (tedit 5B341557)
+(module LED_2816_7142Metric (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
-  (tags diode)
+  (tags LED)
   (attr smd)
   (fp_text reference REF** (at 0 -3.18) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
diff --git a/LED_SMD.pretty/LED_2816_7142Metric_Castellated.kicad_mod b/LED_SMD.pretty/LED_2816_7142Metric_Castellated.kicad_mod
index 1eb57c53f8d..bb5b1093126 100644
--- a/LED_SMD.pretty/LED_2816_7142Metric_Castellated.kicad_mod
+++ b/LED_SMD.pretty/LED_2816_7142Metric_Castellated.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_2816_7142Metric_Castellated (layer F.Cu) (tedit 5B341557)
+(module LED_2816_7142Metric_Castellated (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2816 (7142 Metric), castellated end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "LED castellated")
   (attr smd)
diff --git a/LED_SMD.pretty/LED_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod b/LED_SMD.pretty/LED_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
index 4909d1b8ef2..508c149f540 100644
--- a/LED_SMD.pretty/LED_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
+++ b/LED_SMD.pretty/LED_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module LED_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5B4B45C9)
+(module LED_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5F68FEF1)
   (descr "LED SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "LED handsolder")
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_01005_0402Metric.kicad_mod b/Resistor_SMD.pretty/R_01005_0402Metric.kicad_mod
index 98a3d2c1e29..41c1f3ebee1 100644
--- a/Resistor_SMD.pretty/R_01005_0402Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_01005_0402Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_01005_0402Metric (layer F.Cu) (tedit 5B301BBD)
+(module R_01005_0402Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..937222ae3c9
--- /dev/null
+++ b/Resistor_SMD.pretty/R_01005_0402Metric_Pad0.57x0.30mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module R_01005_0402Metric_Pad0.57x0.30mm_HandSolder (layer F.Cu) (tedit 5F6BBCCE)
+  (descr "Resistor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator")
+  (tags "resistor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value R_01005_0402Metric_Pad0.57x0.30mm_HandSolder (at 0 1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.2 0.1) (end -0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.2 -0.1) (end 0.2 -0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 -0.1) (end 0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.2 0.1) (end -0.2 0.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.78 0.3) (end -0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.78 -0.3) (end 0.78 -0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 -0.3) (end 0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.78 0.3) (end -0.78 0.3) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.3625 0) (size 0.41 0.27) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.3375 0) (size 0.575 0.3) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.62) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_01005_0402Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod b/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod
index b6753e34f7c..21b87a81411 100644
--- a/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD)
+(module R_0201_0603Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..a264abef96d
--- /dev/null
+++ b/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.64x0.40mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module R_0201_0603Metric_Pad0.64x0.40mm_HandSolder (layer F.Cu) (tedit 5F6BB9E0)
+  (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
+  (tags "resistor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.05) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value R_0201_0603Metric_Pad0.64x0.40mm_HandSolder (at 0 1.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.88 0.35) (end -0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.88 -0.35) (end 0.88 -0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 -0.35) (end 0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.88 0.35) (end -0.88 0.35) (layer F.CrtYd) (width 0.05))
+  (pad "" smd roundrect (at -0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad "" smd roundrect (at 0.4325 0) (size 0.458 0.36) (layers F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.4075 0) (size 0.635 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 -0.68) (layer F.Fab)
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod b/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
index 002c3fac1b0..fa3f41b68d6 100644
--- a/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module R_0402_1005Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_0402_1005Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
   (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
@@ -8,18 +8,20 @@
   (fp_text value R_0402_1005Metric (at 0 1.17) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.525 0.27) (end -0.525 -0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.525 -0.27) (end 0.525 -0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.525 -0.27) (end 0.525 0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.525 0.27) (end -0.525 0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.153641 -0.38) (end 0.153641 -0.38) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.153641 0.38) (end 0.153641 0.38) (layer F.SilkS) (width 0.12))
   (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
   (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
   (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
   (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.485 0) (size 0.59 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.51 0) (size 0.54 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.51 0) (size 0.54 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
   (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.25 0.25) (thickness 0.04)))
+    (effects (font (size 0.26 0.26) (thickness 0.04)))
   )
   (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
     (at (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.72x0.64mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.72x0.64mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..acd59b73c49
--- /dev/null
+++ b/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.72x0.64mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module R_0402_1005Metric_Pad0.72x0.64mm_HandSolder (layer F.Cu) (tedit 5F6BB9E0)
+  (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "resistor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.17) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value R_0402_1005Metric_Pad0.72x0.64mm_HandSolder (at 0 1.17) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.525 0.27) (end -0.525 -0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.525 -0.27) (end 0.525 -0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.525 -0.27) (end 0.525 0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.525 0.27) (end -0.525 0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.167621 -0.38) (end 0.167621 -0.38) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.167621 0.38) (end 0.167621 0.38) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.1 0.47) (end -1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.1 -0.47) (end 1.1 -0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 -0.47) (end 1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.1 0.47) (end -1.1 0.47) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.5975 0) (size 0.715 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5975 0) (size 0.715 0.64) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.26 0.26) (thickness 0.04)))
+  )
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod b/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
index f9af004a64c..42ca54ec3dc 100644
--- a/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_0603_1608Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
   (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
@@ -8,18 +8,18 @@
   (fp_text value R_0603_1608Metric (at 0 1.43) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) (layer F.SilkS) (width 0.12))
   (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.825 0) (size 0.8 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.825 0) (size 0.8 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.4 0.4) (thickness 0.06)))
   )
diff --git a/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.98x0.95mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.98x0.95mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..53a49642e80
--- /dev/null
+++ b/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.98x0.95mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module R_0603_1608Metric_Pad0.98x0.95mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "resistor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value R_0603_1608Metric_Pad0.98x0.95mm_HandSolder (at 0 1.43) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.254724 -0.5225) (end 0.254724 -0.5225) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.254724 0.5225) (end 0.254724 0.5225) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.65 0.73) (end -1.65 -0.73) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.65 -0.73) (end 1.65 -0.73) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.65 -0.73) (end 1.65 0.73) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.65 0.73) (end -1.65 0.73) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.9125 0) (size 0.975 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.9125 0) (size 0.975 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.4 0.4) (thickness 0.06)))
+  )
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
deleted file mode 100644
index 2cf901d9286..00000000000
--- a/Resistor_SMD.pretty/R_0603_1608Metric_Pad1.05x0.95mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module R_0603_1608Metric_Pad1.05x0.95mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.43) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value R_0603_1608Metric_Pad1.05x0.95mm_HandSolder (at 0 1.43) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.171267 -0.51) (end 0.171267 -0.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.171267 0.51) (end 0.171267 0.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.65 0.73) (end -1.65 -0.73) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.65 -0.73) (end 1.65 -0.73) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.65 -0.73) (end 1.65 0.73) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.65 0.73) (end -1.65 0.73) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.875 0) (size 1.05 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.875 0) (size 1.05 0.95) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.4 0.4) (thickness 0.06)))
-  )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod b/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod
index a59a0f6720d..1a8a9a3c24d 100644
--- a/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0612_1632Metric (layer F.Cu) (tedit 5B301BBD)
+(module R_0612_1632Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 0612 (1632 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.18x3.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.18x3.40mm_HandSolder.kicad_mod
index c3359ed0635..bea808202e6 100644
--- a/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.18x3.40mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.18x3.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0612_1632Metric_Pad1.18x3.40mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
+(module R_0612_1632Metric_Pad1.18x3.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 0612 (1632 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod b/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
index 27609bb71d8..bfb9e4677cd 100644
--- a/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module R_0805_2012Metric (layer F.Cu) (tedit 5B36C52B)
-  (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+(module R_0805_2012Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
   (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
@@ -8,18 +8,18 @@
   (fp_text value R_0805_2012Metric (at 0 1.65) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
   (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer F.CrtYd) (width 0.05))
   (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.9125 0) (size 1.025 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.243902))
+  (pad 2 smd roundrect (at 0.9125 0) (size 1.025 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.243902))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
diff --git a/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
deleted file mode 100644
index d751686c551..00000000000
--- a/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.15x1.40mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B)
-  (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (at 0 1.65) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
-  (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.217391))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.5 0.5) (thickness 0.08)))
-  )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.20x1.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.20x1.40mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..1ae610faa26
--- /dev/null
+++ b/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.20x1.40mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "resistor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value R_0805_2012Metric_Pad1.20x1.40mm_HandSolder (at 0 1.65) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1 0) (size 1.2 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad 2 smd roundrect (at 1 0) (size 1.2 1.4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.5 0.5) (thickness 0.08)))
+  )
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0815_2038Metric.kicad_mod b/Resistor_SMD.pretty/R_0815_2038Metric.kicad_mod
index d5d6ce7127e..d986929ad84 100644
--- a/Resistor_SMD.pretty/R_0815_2038Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0815_2038Metric.kicad_mod
@@ -1,25 +1,27 @@
-(module R_0815_2038Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 0815 (2038 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.yageo.com/documents/recent/PYu-PRPFPH_521_RoHS_L_0.pdf), generated with kicad-footprint-generator")
+(module R_0815_2038Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 0815 (2038 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.susumu.co.jp/common/pdf/n_catalog_partition07_en.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
-  (fp_text reference REF** (at 0 -2.95) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -2.98) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value R_0815_2038Metric (at 0 2.95) (layer F.Fab)
+  (fp_text value R_0815_2038Metric (at 0 2.98) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -1.075 1.875) (end -1.075 -1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.075 -1.875) (end 1.075 -1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.075 -1.875) (end 1.075 1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.075 1.875) (end -1.075 1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.78 2.25) (end -1.78 -2.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.78 -2.25) (end 1.78 -2.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.78 -2.25) (end 1.78 2.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.78 2.25) (end -1.78 2.25) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.85 0) (size 1.35 4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
-  (pad 2 smd roundrect (at 0.85 0) (size 1.35 4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
+  (fp_line (start -1 1.875) (end -1 -1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -1.875) (end 1 -1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -1.875) (end 1 1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 1.875) (end -1 1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.210242 -1.985) (end 0.210242 -1.985) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.210242 1.985) (end 0.210242 1.985) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.7 2.28) (end -1.7 -2.28) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.7 -2.28) (end 1.7 -2.28) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.7 -2.28) (end 1.7 2.28) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.7 2.28) (end -1.7 2.28) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -0.9375 0) (size 1.025 4.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.243902))
+  (pad 2 smd roundrect (at 0.9375 0) (size 1.025 4.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.243902))
   (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.54 0.54) (thickness 0.08)))
+    (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
   (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0815_2038Metric.wrl
     (at (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0815_2038Metric_Pad1.20x4.05mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0815_2038Metric_Pad1.20x4.05mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..cc16f4895ab
--- /dev/null
+++ b/Resistor_SMD.pretty/R_0815_2038Metric_Pad1.20x4.05mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module R_0815_2038Metric_Pad1.20x4.05mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 0815 (2038 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.susumu.co.jp/common/pdf/n_catalog_partition07_en.pdf), generated with kicad-footprint-generator")
+  (tags "resistor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -2.98) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value R_0815_2038Metric_Pad1.20x4.05mm_HandSolder (at 0 2.98) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1 1.875) (end -1 -1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start -1 -1.875) (end 1 -1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 -1.875) (end 1 1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start 1 1.875) (end -1 1.875) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.210242 -1.985) (end 0.210242 -1.985) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.210242 1.985) (end 0.210242 1.985) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.88 2.28) (end -1.88 -2.28) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.88 -2.28) (end 1.88 -2.28) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.88 -2.28) (end 1.88 2.28) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.88 2.28) (end -1.88 2.28) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.025 0) (size 1.2 4.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (pad 2 smd roundrect (at 1.025 0) (size 1.2 4.05) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.208333))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.5 0.5) (thickness 0.08)))
+  )
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0815_2038Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_0815_2038Metric_Pad1.53x4.00mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0815_2038Metric_Pad1.53x4.00mm_HandSolder.kicad_mod
deleted file mode 100644
index 158d2ddf038..00000000000
--- a/Resistor_SMD.pretty/R_0815_2038Metric_Pad1.53x4.00mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,29 +0,0 @@
-(module R_0815_2038Metric_Pad1.53x4.00mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 0815 (2038 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.yageo.com/documents/recent/PYu-PRPFPH_521_RoHS_L_0.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -2.95) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value R_0815_2038Metric_Pad1.53x4.00mm_HandSolder (at 0 2.95) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -1.075 1.875) (end -1.075 -1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.075 -1.875) (end 1.075 -1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.075 -1.875) (end 1.075 1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.075 1.875) (end -1.075 1.875) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.95 2.25) (end -1.95 -2.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.95 -2.25) (end 1.95 -2.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.95 -2.25) (end 1.95 2.25) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.95 2.25) (end -1.95 2.25) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -0.9375 0) (size 1.525 4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (pad 2 smd roundrect (at 0.9375 0) (size 1.525 4) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.54 0.54) (thickness 0.08)))
-  )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0815_2038Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_1020_2550Metric.kicad_mod b/Resistor_SMD.pretty/R_1020_2550Metric.kicad_mod
index 13d855fd333..d0c5d25dd97 100644
--- a/Resistor_SMD.pretty/R_1020_2550Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1020_2550Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1020_2550Metric (layer F.Cu) (tedit 5B301BBD)
+(module R_1020_2550Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 1020 (2550 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1020_2550Metric_Pad1.33x5.20mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1020_2550Metric_Pad1.33x5.20mm_HandSolder.kicad_mod
index 6f3fb54048f..d1cd106b3a9 100644
--- a/Resistor_SMD.pretty/R_1020_2550Metric_Pad1.33x5.20mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1020_2550Metric_Pad1.33x5.20mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1020_2550Metric_Pad1.33x5.20mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
+(module R_1020_2550Metric_Pad1.33x5.20mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 1020 (2550 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod b/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
index eb4d1b3e2cf..eeaf76e819d 100644
--- a/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module R_1206_3216Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_1206_3216Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
   (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
@@ -12,14 +12,14 @@
   (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -0.91) (end 0.602064 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 0.91) (end 0.602064 0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.727064 -0.91) (end 0.727064 -0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.727064 0.91) (end 0.727064 0.91) (layer F.SilkS) (width 0.12))
   (fp_line (start -2.28 1.12) (end -2.28 -1.12) (layer F.CrtYd) (width 0.05))
   (fp_line (start -2.28 -1.12) (end 2.28 -1.12) (layer F.CrtYd) (width 0.05))
   (fp_line (start 2.28 -1.12) (end 2.28 1.12) (layer F.CrtYd) (width 0.05))
   (fp_line (start 2.28 1.12) (end -2.28 1.12) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4 0) (size 1.25 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
-  (pad 2 smd roundrect (at 1.4 0) (size 1.25 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
+  (pad 1 smd roundrect (at -1.4625 0) (size 1.125 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.222222))
+  (pad 2 smd roundrect (at 1.4625 0) (size 1.125 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.222222))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
diff --git a/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.30x1.75mm_HandSolder.kicad_mod
similarity index 64%
rename from Resistor_SMD.pretty/R_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
rename to Resistor_SMD.pretty/R_1206_3216Metric_Pad1.30x1.75mm_HandSolder.kicad_mod
index 43eb97169a4..3a3e2c96a8e 100644
--- a/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.42x1.75mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.30x1.75mm_HandSolder.kicad_mod
@@ -1,25 +1,25 @@
-(module R_1206_3216Metric_Pad1.42x1.75mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_1206_3216Metric_Pad1.30x1.75mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.82) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value R_1206_3216Metric_Pad1.42x1.75mm_HandSolder (at 0 1.82) (layer F.Fab)
+  (fp_text value R_1206_3216Metric_Pad1.30x1.75mm_HandSolder (at 0 1.82) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer F.Fab) (width 0.1))
   (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer F.Fab) (width 0.1))
   (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -0.91) (end 0.602064 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 0.91) (end 0.602064 0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.727064 -0.91) (end 0.727064 -0.91) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.727064 0.91) (end 0.727064 0.91) (layer F.SilkS) (width 0.12))
   (fp_line (start -2.45 1.12) (end -2.45 -1.12) (layer F.CrtYd) (width 0.05))
   (fp_line (start -2.45 -1.12) (end 2.45 -1.12) (layer F.CrtYd) (width 0.05))
   (fp_line (start 2.45 -1.12) (end 2.45 1.12) (layer F.CrtYd) (width 0.05))
   (fp_line (start 2.45 1.12) (end -2.45 1.12) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4875 0) (size 1.425 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
-  (pad 2 smd roundrect (at 1.4875 0) (size 1.425 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
+  (pad 1 smd roundrect (at -1.55 0) (size 1.3 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (pad 2 smd roundrect (at 1.55 0) (size 1.3 1.75) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
diff --git a/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod b/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
index 402a1a44c58..e75f95e3a39 100644
--- a/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module R_1210_3225Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_1210_3225Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
@@ -8,18 +8,18 @@
   (fp_text value R_1210_3225Metric (at 0 2.28) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.6 1.245) (end -1.6 -1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.6 -1.245) (end 1.6 -1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 -1.245) (end 1.6 1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 1.245) (end -1.6 1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.723737 -1.355) (end 0.723737 -1.355) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.723737 1.355) (end 0.723737 1.355) (layer F.SilkS) (width 0.12))
   (fp_line (start -2.28 1.58) (end -2.28 -1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start -2.28 -1.58) (end 2.28 -1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start 2.28 -1.58) (end 2.28 1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start 2.28 1.58) (end -2.28 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4 0) (size 1.25 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
-  (pad 2 smd roundrect (at 1.4 0) (size 1.25 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.2))
+  (pad 1 smd roundrect (at -1.4625 0) (size 1.125 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.222222))
+  (pad 2 smd roundrect (at 1.4625 0) (size 1.125 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.222222))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.8 0.8) (thickness 0.12)))
   )
diff --git a/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.30x2.65mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.30x2.65mm_HandSolder.kicad_mod
new file mode 100644
index 00000000000..294b16d97f8
--- /dev/null
+++ b/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.30x2.65mm_HandSolder.kicad_mod
@@ -0,0 +1,31 @@
+(module R_1210_3225Metric_Pad1.30x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "resistor handsolder")
+  (attr smd)
+  (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value R_1210_3225Metric_Pad1.30x2.65mm_HandSolder (at 0 2.28) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.6 1.245) (end -1.6 -1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.6 -1.245) (end 1.6 -1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 -1.245) (end 1.6 1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.6 1.245) (end -1.6 1.245) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.723737 -1.355) (end 0.723737 -1.355) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.723737 1.355) (end 0.723737 1.355) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd roundrect (at -1.55 0) (size 1.3 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (pad 2 smd roundrect (at 1.55 0) (size 1.3 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.192308))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.8 0.8) (thickness 0.12)))
+  )
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1210_3225Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
deleted file mode 100644
index 8c40f61143f..00000000000
--- a/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.42x2.65mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module R_1210_3225Metric_Pad1.42x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value R_1210_3225Metric_Pad1.42x2.65mm_HandSolder (at 0 2.28) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -1.6 1.25) (end -1.6 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.6 -1.25) (end 1.6 -1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 -1.25) (end 1.6 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.6 1.25) (end -1.6 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.602064 -1.36) (end 0.602064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.602064 1.36) (end 0.602064 1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.45 1.58) (end -2.45 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.45 -1.58) (end 2.45 -1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.45 -1.58) (end 2.45 1.58) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.45 1.58) (end -2.45 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -1.4875 0) (size 1.425 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
-  (pad 2 smd roundrect (at 1.4875 0) (size 1.425 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.175439))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 0.8 0.8) (thickness 0.12)))
-  )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1210_3225Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod b/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod
index 4962e8bd4df..0cbba6f4325 100644
--- a/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1218_3246Metric (layer F.Cu) (tedit 5B341556)
+(module R_1218_3246Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 1218 (3246 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20035/dcrcwe3.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.22x4.75mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.22x4.75mm_HandSolder.kicad_mod
index 5754a5700e6..6b76f5a66d3 100644
--- a/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.22x4.75mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.22x4.75mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1218_3246Metric_Pad1.22x4.75mm_HandSolder (layer F.Cu) (tedit 5B341556)
+(module R_1218_3246Metric_Pad1.22x4.75mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 1218 (3246 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20035/dcrcwe3.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1806_4516Metric.kicad_mod b/Resistor_SMD.pretty/R_1806_4516Metric.kicad_mod
deleted file mode 100644
index 4e927f53ac9..00000000000
--- a/Resistor_SMD.pretty/R_1806_4516Metric.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module R_1806_4516Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags resistor)
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value R_1806_4516Metric (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.95 1.15) (end -2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.95 -1.15) (end 2.95 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 -1.15) (end 2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.95 1.15) (end -2.95 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (pad 2 smd roundrect (at 2 0) (size 1.4 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
deleted file mode 100644
index a7849b1fe43..00000000000
--- a/Resistor_SMD.pretty/R_1806_4516Metric_Pad1.57x1.80mm_HandSolder.kicad_mod
+++ /dev/null
@@ -1,31 +0,0 @@
-(module R_1806_4516Metric_Pad1.57x1.80mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator")
-  (tags "resistor handsolder")
-  (attr smd)
-  (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value R_1806_4516Metric_Pad1.57x1.80mm_HandSolder (at 0 1.85) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -2.25 0.8) (end -2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.25 -0.8) (end 2.25 -0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 -0.8) (end 2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.25 0.8) (end -2.25 0.8) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.111252 -0.91) (end 1.111252 -0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.111252 0.91) (end 1.111252 0.91) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.12 1.15) (end -3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -3.12 -1.15) (end 3.12 -1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 -1.15) (end 3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.12 1.15) (end -3.12 1.15) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (pad 2 smd roundrect (at 2.0875 0) (size 1.575 1.8) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.15873))
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1806_4516Metric.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
diff --git a/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod b/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod
index 3fa988f410f..14b69fd6eee 100644
--- a/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1812_4532Metric (layer F.Cu) (tedit 5B301BBD)
+(module R_1812_4532Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
index 38af1c86531..812025d4e6a 100644
--- a/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.30x3.40mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
+(module R_1812_4532Metric_Pad1.30x3.40mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod b/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
index 9285488f827..db9ec868037 100644
--- a/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module R_2010_5025Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_2010_5025Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
@@ -12,14 +12,14 @@
   (fp_line (start -2.5 -1.25) (end 2.5 -1.25) (layer F.Fab) (width 0.1))
   (fp_line (start 2.5 -1.25) (end 2.5 1.25) (layer F.Fab) (width 0.1))
   (fp_line (start 2.5 1.25) (end -2.5 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.402064 -1.36) (end 1.402064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.402064 1.36) (end 1.402064 1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.527064 -1.36) (end 1.527064 -1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.527064 1.36) (end 1.527064 1.36) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.18 1.58) (end -3.18 -1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start -3.18 -1.58) (end 3.18 -1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start 3.18 -1.58) (end 3.18 1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start 3.18 1.58) (end -3.18 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.25 0) (size 1.35 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
-  (pad 2 smd roundrect (at 2.25 0) (size 1.35 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
+  (pad 1 smd roundrect (at -2.3125 0) (size 1.225 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.204082))
+  (pad 2 smd roundrect (at 2.3125 0) (size 1.225 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.204082))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.40x2.65mm_HandSolder.kicad_mod
similarity index 64%
rename from Resistor_SMD.pretty/R_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
rename to Resistor_SMD.pretty/R_2010_5025Metric_Pad1.40x2.65mm_HandSolder.kicad_mod
index 2464ab28136..61ec901b860 100644
--- a/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.52x2.65mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.40x2.65mm_HandSolder.kicad_mod
@@ -1,25 +1,25 @@
-(module R_2010_5025Metric_Pad1.52x2.65mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_2010_5025Metric_Pad1.40x2.65mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value R_2010_5025Metric_Pad1.52x2.65mm_HandSolder (at 0 2.28) (layer F.Fab)
+  (fp_text value R_2010_5025Metric_Pad1.40x2.65mm_HandSolder (at 0 2.28) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -2.5 1.25) (end -2.5 -1.25) (layer F.Fab) (width 0.1))
   (fp_line (start -2.5 -1.25) (end 2.5 -1.25) (layer F.Fab) (width 0.1))
   (fp_line (start 2.5 -1.25) (end 2.5 1.25) (layer F.Fab) (width 0.1))
   (fp_line (start 2.5 1.25) (end -2.5 1.25) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.402064 -1.36) (end 1.402064 -1.36) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.402064 1.36) (end 1.402064 1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.527064 -1.36) (end 1.527064 -1.36) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.527064 1.36) (end 1.527064 1.36) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.35 1.58) (end -3.35 -1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start -3.35 -1.58) (end 3.35 -1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start 3.35 -1.58) (end 3.35 1.58) (layer F.CrtYd) (width 0.05))
   (fp_line (start 3.35 1.58) (end -3.35 1.58) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.3375 0) (size 1.525 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (pad 2 smd roundrect (at 2.3375 0) (size 1.525 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
+  (pad 1 smd roundrect (at -2.4 0) (size 1.4 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
+  (pad 2 smd roundrect (at 2.4 0) (size 1.4 2.65) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod b/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
index 842109f7077..ad30d4fbfcb 100644
--- a/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
@@ -1,5 +1,5 @@
-(module R_2512_6332Metric (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_2512_6332Metric (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
   (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
@@ -12,14 +12,14 @@
   (fp_line (start -3.15 -1.6) (end 3.15 -1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 3.15 -1.6) (end 3.15 1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 3.15 1.6) (end -3.15 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.052064 -1.71) (end 2.052064 -1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.052064 1.71) (end 2.052064 1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.177064 -1.71) (end 2.177064 -1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.177064 1.71) (end 2.177064 1.71) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.82 1.92) (end -3.82 -1.92) (layer F.CrtYd) (width 0.05))
   (fp_line (start -3.82 -1.92) (end 3.82 -1.92) (layer F.CrtYd) (width 0.05))
   (fp_line (start 3.82 -1.92) (end 3.82 1.92) (layer F.CrtYd) (width 0.05))
   (fp_line (start 3.82 1.92) (end -3.82 1.92) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.9 0) (size 1.35 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
-  (pad 2 smd roundrect (at 2.9 0) (size 1.35 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.185185))
+  (pad 1 smd roundrect (at -2.9625 0) (size 1.225 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.204082))
+  (pad 2 smd roundrect (at 2.9625 0) (size 1.225 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.204082))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.40x3.35mm_HandSolder.kicad_mod
similarity index 64%
rename from Resistor_SMD.pretty/R_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
rename to Resistor_SMD.pretty/R_2512_6332Metric_Pad1.40x3.35mm_HandSolder.kicad_mod
index a64884d9f28..f9dc5cfa0de 100644
--- a/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.52x3.35mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.40x3.35mm_HandSolder.kicad_mod
@@ -1,25 +1,25 @@
-(module R_2512_6332Metric_Pad1.52x3.35mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
-  (descr "Resistor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+(module R_2512_6332Metric_Pad1.40x3.35mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
+  (descr "Resistor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.62) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value R_2512_6332Metric_Pad1.52x3.35mm_HandSolder (at 0 2.62) (layer F.Fab)
+  (fp_text value R_2512_6332Metric_Pad1.40x3.35mm_HandSolder (at 0 2.62) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -3.15 1.6) (end -3.15 -1.6) (layer F.Fab) (width 0.1))
   (fp_line (start -3.15 -1.6) (end 3.15 -1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 3.15 -1.6) (end 3.15 1.6) (layer F.Fab) (width 0.1))
   (fp_line (start 3.15 1.6) (end -3.15 1.6) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.052064 -1.71) (end 2.052064 -1.71) (layer F.SilkS) (width 0.12))
-  (fp_line (start -2.052064 1.71) (end 2.052064 1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.177064 -1.71) (end 2.177064 -1.71) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.177064 1.71) (end 2.177064 1.71) (layer F.SilkS) (width 0.12))
   (fp_line (start -4 1.92) (end -4 -1.92) (layer F.CrtYd) (width 0.05))
   (fp_line (start -4 -1.92) (end 4 -1.92) (layer F.CrtYd) (width 0.05))
   (fp_line (start 4 -1.92) (end 4 1.92) (layer F.CrtYd) (width 0.05))
   (fp_line (start 4 1.92) (end -4 1.92) (layer F.CrtYd) (width 0.05))
-  (pad 1 smd roundrect (at -2.9875 0) (size 1.525 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
-  (pad 2 smd roundrect (at 2.9875 0) (size 1.525 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.163934))
+  (pad 1 smd roundrect (at -3.05 0) (size 1.4 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
+  (pad 2 smd roundrect (at 3.05 0) (size 1.4 3.35) (layers F.Cu F.Mask F.Paste) (roundrect_rratio 0.178571))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod b/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod
index ecba863042f..1a02f65115f 100644
--- a/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2816_7142Metric (layer F.Cu) (tedit 5B341556)
+(module R_2816_7142Metric (layer F.Cu) (tedit 5F6BB4C9)
   (descr "Resistor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
index 7b71ec9b07b..99871897afe 100644
--- a/Resistor_SMD.pretty/R_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2816_7142Metric_Pad3.20x4.45mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5B341556)
+(module R_2816_7142Metric_Pad3.20x4.45mm_HandSolder (layer F.Cu) (tedit 5F6BB4CA)
   (descr "Resistor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_4020_10251Metric.kicad_mod b/Resistor_SMD.pretty/R_4020_10251Metric.kicad_mod
index 3d5e19a4651..0899b3bfa5f 100644
--- a/Resistor_SMD.pretty/R_4020_10251Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_4020_10251Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_4020_10251Metric (layer F.Cu) (tedit 5B301BBD)
+(module R_4020_10251Metric (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 4020 (10251 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://datasheet.octopart.com/HVC0603T5004FET-Ohmite-datasheet-26699797.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_4020_10251Metric_Pad1.65x5.30mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_4020_10251Metric_Pad1.65x5.30mm_HandSolder.kicad_mod
index c65cf5d77f4..7b527a792f8 100644
--- a/Resistor_SMD.pretty/R_4020_10251Metric_Pad1.65x5.30mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_4020_10251Metric_Pad1.65x5.30mm_HandSolder.kicad_mod
@@ -1,4 +1,4 @@
-(module R_4020_10251Metric_Pad1.65x5.30mm_HandSolder (layer F.Cu) (tedit 5B301BBD)
+(module R_4020_10251Metric_Pad1.65x5.30mm_HandSolder (layer F.Cu) (tedit 5F68FEEE)
   (descr "Resistor SMD 4020 (10251 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://datasheet.octopart.com/HVC0603T5004FET-Ohmite-datasheet-26699797.pdf), generated with kicad-footprint-generator")
   (tags "resistor handsolder")
   (attr smd)