diff --git a/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod b/Resistor_SMD.pretty/R_0201_0603Metric.kicad_mod
index edffd1860..ab356a454 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 59FCBE16)
+(module R_0201_0603Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0201 (0603 Metric), 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.50x0.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.kicad_mod
index 809839f1f..15a4f7a49 100644
--- a/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_0201_0603Metric_Pad0.50x0.40mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_0201_0603Metric_Pad0.50x0.40mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0201 (0603 Metric), 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")
+  (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.4) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -21,7 +21,7 @@
   (fp_text user %R (at 0 -0.78) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric_Pad0.50x0.40mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0201_0603Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod b/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
index c4b77b1ac..13d4752a3 100644
--- a/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0402_1005Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0402_1005Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_0402_1005Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0402 (1005 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
@@ -12,10 +12,10 @@
   (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.825 0.475) (end -0.825 -0.475) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.825 -0.475) (end 0.825 -0.475) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.825 -0.475) (end 0.825 0.475) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.825 0.475) (end -0.825 0.475) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.82 0.48) (end -0.82 -0.48) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.82 -0.48) (end 0.82 -0.48) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.82 -0.48) (end 0.82 0.48) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.82 0.48) (end -0.82 0.48) (layer F.CrtYd) (width 0.05))
   (pad 1 smd rect (at -0.3875 0) (size 0.575 0.65) (layers F.Cu F.Mask F.Paste))
   (pad 2 smd rect (at 0.3875 0) (size 0.575 0.65) (layers F.Cu F.Mask F.Paste))
   (fp_text user %R (at 0 -0.88) (layer F.Fab)
diff --git a/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod
index 78ecd3c7b..49ed9f52c 100644
--- a/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_0402_1005Metric_Pad0.73x0.65mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_0402_1005Metric_Pad0.73x0.65mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0402 (1005 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -12,16 +12,16 @@
   (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.975 0.475) (end -0.975 -0.475) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.975 -0.475) (end 0.975 -0.475) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.975 -0.475) (end 0.975 0.475) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 0.975 0.475) (end -0.975 0.475) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.98 0.48) (end -0.98 -0.48) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -0.98 -0.48) (end 0.98 -0.48) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.98 -0.48) (end 0.98 0.48) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 0.98 0.48) (end -0.98 0.48) (layer F.CrtYd) (width 0.05))
   (pad 1 smd rect (at -0.4625 0) (size 0.725 0.65) (layers F.Cu F.Mask F.Paste))
   (pad 2 smd rect (at 0.4625 0) (size 0.725 0.65) (layers F.Cu F.Mask F.Paste))
   (fp_text user %R (at 0 -0.88) (layer F.Fab)
     (effects (font (size 0.5 0.5) (thickness 0.08)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric_Pad0.73x0.65mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0402_1005Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod b/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
index b308f91ce..7aad0b13e 100644
--- a/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0603_1608Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0603_1608Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_0603_1608Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0603 (1608 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod
index 95756f9a1..bbe8c41f4 100644
--- a/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0603_1608Metric_Pad0.82x1.00mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_0603_1608Metric_Pad0.82x1.00mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_0603_1608Metric_Pad0.82x1.00mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0603 (1608 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.65) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (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_0603_1608Metric_Pad0.82x1.00mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0603_1608Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod b/Resistor_SMD.pretty/R_0612_1632Metric.kicad_mod
index bcf49c10f..773363ac5 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 59FCBE16)
+(module R_0612_1632Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0612 (1632 Metric), 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.07x3.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.07x3.50mm_HandSolder.kicad_mod
index d40de782d..b6db8f644 100644
--- a/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.07x3.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0612_1632Metric_Pad1.07x3.50mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_0612_1632Metric_Pad1.07x3.50mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_0612_1632Metric_Pad1.07x3.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0612 (1632 Metric), 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")
+  (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -21,7 +21,7 @@
   (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_0612_1632Metric_Pad1.07x3.50mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0612_1632Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod b/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
index 684e8809d..e30ff3bdd 100644
--- a/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0805_2012Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0805_2012Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_0805_2012Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0805 (2012 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod
index ddc189916..badb89c3c 100644
--- a/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0805_2012Metric_Pad1.12x1.50mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_0805_2012Metric_Pad1.12x1.50mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_0805_2012Metric_Pad1.12x1.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0805 (2012 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -1.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (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_Pad1.12x1.50mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0805_2012Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod b/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod
index 0e8f8d880..bec51a5ff 100644
--- a/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_0815_2037Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0815_2037Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_0815_2037Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0815 (2037 Metric), IPC_7351 nominal, (Body size source: http://www.yageo.com/documents/recent/PYu-PRPFPH_521_RoHS_L_0.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod
index 2dd74dc10..674221177 100644
--- a/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_0815_2037Metric_Pad1.46x4.10mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_0815_2037Metric_Pad1.46x4.10mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_0815_2037Metric_Pad1.46x4.10mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 0815 (2037 Metric), 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")
+  (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -3.12) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -21,7 +21,7 @@
   (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_2037Metric_Pad1.46x4.10mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_0815_2037Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod b/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod
index dafa29965..30d3d4105 100644
--- a/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1020_1632Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1020_1632Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_1020_1632Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1020 (1632 Metric), 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_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod
index 205437f6f..96bc154c3 100644
--- a/Resistor_SMD.pretty/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_1020_1632Metric_Pad1.22x5.30mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_1020_1632Metric_Pad1.22x5.30mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1020 (1632 Metric), 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")
+  (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -3.75) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.62 0.62) (thickness 0.09)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1020_1632Metric_Pad1.22x5.30mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1020_1632Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod b/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
index dcf7acda6..01b50431a 100644
--- a/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1206_3216Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1206_3216Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_1206_3216Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1206 (3216 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod
index 9ddc74879..67cb71e28 100644
--- a/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1206_3216Metric_Pad1.22x1.80mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_1206_3216Metric_Pad1.22x1.80mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_1206_3216Metric_Pad1.22x1.80mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1206 (3216 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.05) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (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_1206_3216Metric_Pad1.22x1.80mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1206_3216Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod b/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
index d260901ca..c8391812f 100644
--- a/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_1210_3225Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_1210_3225Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_1210_3225Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1210 (3225 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod
index 268e3a88b..d0a7aa5aa 100644
--- a/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1210_3225Metric_Pad1.22x2.70mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_1210_3225Metric_Pad1.22x2.70mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_1210_3225Metric_Pad1.22x2.70mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1210 (3225 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (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_Pad1.22x2.70mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1210_3225Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod b/Resistor_SMD.pretty/R_1218_3246Metric.kicad_mod
index 09bdde538..7606a5140 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 59FCBE16)
+(module R_1218_3246Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1218 (3246 Metric), 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.12x5.80mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.12x5.80mm_HandSolder.kicad_mod
index 41095e9b6..ed13fa4c4 100644
--- a/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.12x5.80mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1218_3246Metric_Pad1.12x5.80mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_1218_3246Metric_Pad1.12x5.80mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_1218_3246Metric_Pad1.12x5.80mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1218 (3246 Metric), 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")
+  (tags "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -3.55) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (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_1218_3246Metric_Pad1.12x5.80mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1218_3246Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod b/Resistor_SMD.pretty/R_1812_4532Metric.kicad_mod
index 60558b405..115b76c29 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 59FCBE16)
+(module R_1812_4532Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1812 (4532 Metric), 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.22x3.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.kicad_mod
index e86d4c9b1..b13eb7d2e 100644
--- a/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_1812_4532Metric_Pad1.22x3.50mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_1812_4532Metric_Pad1.22x3.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 1812 (4532 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1812_4532Metric_Pad1.22x3.50mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_1812_4532Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod b/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
index 10a75975d..180f2f67f 100644
--- a/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2010_5025Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2010_5025Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_2010_5025Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 2010 (5025 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod
index 0e2d25c42..128c91746 100644
--- a/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_2010_5025Metric_Pad1.32x2.70mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_2010_5025Metric_Pad1.32x2.70mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 2010 (5025 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_2010_5025Metric_Pad1.32x2.70mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_2010_5025Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod b/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
index 6d9fee7fd..63a1723b5 100644
--- a/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
+++ b/Resistor_SMD.pretty/R_2512_6332Metric.kicad_mod
@@ -1,4 +1,4 @@
-(module R_2512_6332Metric (layer F.Cu) (tedit 59FCBE16)
+(module R_2512_6332Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 2512 (6332 Metric), IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
   (tags resistor)
   (attr smd)
diff --git a/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod
index 39fdef371..b62e373b0 100644
--- a/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_2512_6332Metric_Pad1.32x3.40mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_2512_6332Metric_Pad1.32x3.40mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 2512 (6332 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -2.85) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_2512_6332Metric_Pad1.32x3.40mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_2512_6332Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod b/Resistor_SMD.pretty/R_2816_7142Metric.kicad_mod
index 046577ee4..ac0ba4165 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 59FCBE16)
+(module R_2816_7142Metric (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 2816 (7142 Metric), 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_Pad2.39x4.50mm_HandSolder.kicad_mod b/Resistor_SMD.pretty/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.kicad_mod
index f590dced0..8a960b4e1 100644
--- a/Resistor_SMD.pretty/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.kicad_mod
+++ b/Resistor_SMD.pretty/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.kicad_mod
@@ -1,6 +1,6 @@
-(module R_2816_7142Metric_Pad2.39x4.50mm_HandSolder (layer F.Cu) (tedit 59FCBE16)
+(module R_2816_7142Metric_Pad2.39x4.50mm_HandSolder (layer F.Cu) (tedit 59FCCDB2)
   (descr "Resistor SMD 2816 (7142 Metric), 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 "resistor handsolder")
   (attr smd)
   (fp_text reference REF** (at 0 -3.35) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_2816_7142Metric_Pad2.39x4.50mm_HandSolder.wrl
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/${KISYS3DMOD}/_2816_7142Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))