diff --git a/AppleIIBus_Edge.kicad_mod b/AppleIIBus_Edge.kicad_mod
new file mode 100644
index 0000000..18ba966
--- /dev/null
+++ b/AppleIIBus_Edge.kicad_mod
@@ -0,0 +1,80 @@
+(module AppleIIBus_Edge (layer F.Cu) (tedit 5CFD75F7)
+  (attr virtual)
+  (fp_text reference REF** (at 0 -6.35) (layer F.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)))
+  )
+  (fp_text value AppleIIBus_Edge (at 0 -5.08) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 33.02 -3.81) (end 33.02 4.318) (layer B.Fab) (width 0.127))
+  (fp_line (start -32.512 4.318) (end -32.512 -3.81) (layer F.Fab) (width 0.127))
+  (fp_line (start 33.02 4.318) (end -32.512 4.318) (layer F.Fab) (width 0.127))
+  (fp_line (start 33.02 -3.81) (end 33.02 4.318) (layer F.Fab) (width 0.127))
+  (fp_text user REF** (at 0 -6.35) (layer B.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)) (justify mirror))
+  )
+  (fp_line (start 33.02 4.318) (end -32.512 4.318) (layer B.Fab) (width 0.127))
+  (fp_line (start -32.512 4.318) (end -32.512 -3.81) (layer B.Fab) (width 0.127))
+  (fp_text user 1 (at -30.48 -6.35) (layer F.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)))
+  )
+  (fp_text user 25 (at 30.48 -6.35) (layer F.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)))
+  )
+  (fp_text user 26 (at 30.48 -6.35) (layer B.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)) (justify mirror))
+  )
+  (fp_text user 50 (at -30.48 -6.35) (layer B.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)) (justify mirror))
+  )
+  (pad 1 smd roundrect (at -30.48 0 180) (size 1.524 7.54) (layers F.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -27.94 0 180) (size 1.524 7.54) (layers F.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -25.4 0 180) (size 1.524 7.54) (layers F.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -22.86 0 180) (size 1.524 7.54) (layers F.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -20.32 0 180) (size 1.524 7.54) (layers F.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -17.78 0 180) (size 1.524 7.54) (layers F.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -15.24 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -12.7 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -10.16 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -7.62 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at -5.08 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at -2.54 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 0 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 2.54 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 5.08 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 7.62 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 10.16 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 12.7 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 15.24 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 17.78 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 21 smd roundrect (at 20.32 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 22 smd roundrect (at 22.86 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 23 smd roundrect (at 25.4 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 24 smd roundrect (at 27.94 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 25 smd roundrect (at 30.48 0 180) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
+  (pad 29 smd roundrect (at 22.86 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 30 smd roundrect (at 20.32 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 31 smd roundrect (at 17.78 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 32 smd roundrect (at 15.24 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 33 smd roundrect (at 12.7 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 34 smd roundrect (at 10.16 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 35 smd roundrect (at 7.62 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 36 smd roundrect (at 5.08 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 37 smd roundrect (at 2.54 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 38 smd roundrect (at 0 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 39 smd roundrect (at -2.54 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 40 smd roundrect (at -5.08 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 41 smd roundrect (at -7.62 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 42 smd roundrect (at -10.16 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 43 smd roundrect (at -12.7 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 44 smd roundrect (at -15.24 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 45 smd roundrect (at -17.78 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 46 smd roundrect (at -20.32 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 47 smd roundrect (at -22.86 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 48 smd roundrect (at -25.4 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 49 smd roundrect (at -27.94 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 50 smd roundrect (at -30.48 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 28 smd roundrect (at 25.4 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 27 smd roundrect (at 27.94 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+  (pad 26 smd roundrect (at 30.48 0 180) (size 1.524 7.54) (layers B.Cu B.Mask) (roundrect_rratio 0.25))
+)
diff --git a/Apple_IIGS-MemoryExpansion.kicad_mod b/AppleIIgsMemoryExpansion_Edge.kicad_mod
similarity index 87%
rename from Apple_IIGS-MemoryExpansion.kicad_mod
rename to AppleIIgsMemoryExpansion_Edge.kicad_mod
index b47eebe..aa0c0eb 100644
--- a/Apple_IIGS-MemoryExpansion.kicad_mod
+++ b/AppleIIgsMemoryExpansion_Edge.kicad_mod
@@ -1,19 +1,32 @@
-(module Apple_IIGS-MemoryExpansion (layer F.Cu) (tedit 5C271031)
-  (fp_text reference REF** (at 25.4 -5.08) (layer F.SilkS)
+(module AppleIIgsMemoryExpansion_Edge (layer F.Cu) (tedit 5CFD760B)
+  (attr virtual)
+  (fp_text reference REF** (at 0 -6.35) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value Apple_IIGS-MemoryExpansion (at 0 -5.08) (layer F.Fab)
+  (fp_text value AppleIIgsMemoryExpansion_Edge (at 0 -5.08) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start 28.702 -3.81) (end 28.702 4.318) (layer B.Fab) (width 0.127))
   (fp_line (start -28.702 4.318) (end -28.702 -3.81) (layer F.Fab) (width 0.127))
   (fp_line (start 28.702 4.318) (end -28.702 4.318) (layer F.Fab) (width 0.127))
   (fp_line (start 28.702 -3.81) (end 28.702 4.318) (layer F.Fab) (width 0.127))
-  (fp_text user REF** (at 25.4 -5.08) (layer B.SilkS)
+  (fp_text user REF** (at 0 -6.35) (layer B.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
   )
   (fp_line (start 28.702 4.318) (end -28.702 4.318) (layer B.Fab) (width 0.127))
   (fp_line (start -28.702 4.318) (end -28.702 -3.81) (layer B.Fab) (width 0.127))
+  (fp_text user 23 (at -26.67 -6.35) (layer F.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)))
+  )
+  (fp_text user 22 (at -26.67 -6.35) (layer B.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)) (justify mirror))
+  )
+  (fp_text user 1 (at 26.67 -5.08) (layer B.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)) (justify mirror))
+  )
+  (fp_text user 44 (at 26.67 -5.08) (layer F.SilkS)
+    (effects (font (size 1.016 1.016) (thickness 0.1524)))
+  )
   (pad 44 smd roundrect (at 26.67 0) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
   (pad 43 smd roundrect (at 24.13 0) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
   (pad 42 smd roundrect (at 21.59 0) (size 1.524 7.54) (layers F.Cu F.Mask) (roundrect_rratio 0.25))
diff --git a/BGA-256_14.0x14.0mm_Layout16x16_P0.8mm_Ball0.45mm_Pad0.32mm_NSMD.kicad_mod b/BGA-256_14.0x14.0mm_Layout16x16_P0.8mm_Ball0.45mm_Pad0.32mm_NSMD.kicad_mod
deleted file mode 100644
index 3962443..0000000
--- a/BGA-256_14.0x14.0mm_Layout16x16_P0.8mm_Ball0.45mm_Pad0.32mm_NSMD.kicad_mod
+++ /dev/null
@@ -1,291 +0,0 @@
-(module BGA-256_14.0x14.0mm_Layout16x16_P0.8mm_Ball0.45mm_Pad0.32mm_NSMD (layer F.Cu) (tedit 5B6330C4)
-  (descr "BGA-256, dimensions: https://www.xilinx.com/support/documentation/package_specs/ft256.pdf, design rules: https://www.xilinx.com/support/documentation/user_guides/ug1099-bga-device-design-rules.pdf")
-  (tags BGA-256)
-  (solder_mask_margin 0.075)
-  (attr smd)
-  (fp_text reference REF** (at 0 -8.2) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text value BGA-256_14.0x14.0mm_Layout16x16_P0.8mm_Ball0.45mm_Pad0.32mm_NSMD (at 0 8.2) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_text user %R (at 0 0) (layer F.Fab)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -6.6 -7.3) (end -7.3 -7.3) (layer F.SilkS) (width 0.12))
-  (fp_line (start -7.3 -7.3) (end -7.3 -6.6) (layer F.SilkS) (width 0.12))
-  (fp_line (start 7.1 -7.1) (end -7.1 -7.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -7.1 -7.1) (end -7.1 7.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -7.1 7.1) (end 7.1 7.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start 7.1 7.1) (end 7.1 -7.1) (layer F.SilkS) (width 0.12))
-  (fp_line (start -7 7) (end 7 7) (layer F.Fab) (width 0.1))
-  (fp_line (start 7 7) (end 7 -7) (layer F.Fab) (width 0.1))
-  (fp_line (start 7 -7) (end -6 -7) (layer F.Fab) (width 0.1))
-  (fp_line (start -6 -7) (end -7 -6) (layer F.Fab) (width 0.1))
-  (fp_line (start -7 -6) (end -7 7) (layer F.Fab) (width 0.1))
-  (fp_line (start -8 -8) (end 8 -8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -8 -8) (end -8 8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 8 8) (end 8 -8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 8 8) (end -8 8) (layer F.CrtYd) (width 0.05))
-  (pad A1 smd circle (at -6 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B1 smd circle (at -6 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C1 smd circle (at -6 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D1 smd circle (at -6 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E1 smd circle (at -6 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F1 smd circle (at -6 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G1 smd circle (at -6 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H1 smd circle (at -6 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J1 smd circle (at -6 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K1 smd circle (at -6 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L1 smd circle (at -6 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M1 smd circle (at -6 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N1 smd circle (at -6 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P1 smd circle (at -6 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R1 smd circle (at -6 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T1 smd circle (at -6 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A2 smd circle (at -5.2 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B2 smd circle (at -5.2 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C2 smd circle (at -5.2 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D2 smd circle (at -5.2 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E2 smd circle (at -5.2 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F2 smd circle (at -5.2 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G2 smd circle (at -5.2 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H2 smd circle (at -5.2 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J2 smd circle (at -5.2 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K2 smd circle (at -5.2 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L2 smd circle (at -5.2 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M2 smd circle (at -5.2 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N2 smd circle (at -5.2 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P2 smd circle (at -5.2 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R2 smd circle (at -5.2 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T2 smd circle (at -5.2 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A3 smd circle (at -4.4 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B3 smd circle (at -4.4 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C3 smd circle (at -4.4 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D3 smd circle (at -4.4 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E3 smd circle (at -4.4 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F3 smd circle (at -4.4 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G3 smd circle (at -4.4 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H3 smd circle (at -4.4 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J3 smd circle (at -4.4 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K3 smd circle (at -4.4 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L3 smd circle (at -4.4 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M3 smd circle (at -4.4 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N3 smd circle (at -4.4 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P3 smd circle (at -4.4 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R3 smd circle (at -4.4 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T3 smd circle (at -4.4 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A4 smd circle (at -3.6 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B4 smd circle (at -3.6 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C4 smd circle (at -3.6 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D4 smd circle (at -3.6 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E4 smd circle (at -3.6 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F4 smd circle (at -3.6 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G4 smd circle (at -3.6 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H4 smd circle (at -3.6 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J4 smd circle (at -3.6 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K4 smd circle (at -3.6 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L4 smd circle (at -3.6 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M4 smd circle (at -3.6 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N4 smd circle (at -3.6 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P4 smd circle (at -3.6 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R4 smd circle (at -3.6 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T4 smd circle (at -3.6 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A5 smd circle (at -2.8 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B5 smd circle (at -2.8 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C5 smd circle (at -2.8 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D5 smd circle (at -2.8 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E5 smd circle (at -2.8 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F5 smd circle (at -2.8 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G5 smd circle (at -2.8 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H5 smd circle (at -2.8 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J5 smd circle (at -2.8 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K5 smd circle (at -2.8 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L5 smd circle (at -2.8 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M5 smd circle (at -2.8 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N5 smd circle (at -2.8 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P5 smd circle (at -2.8 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R5 smd circle (at -2.8 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T5 smd circle (at -2.8 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A6 smd circle (at -2 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B6 smd circle (at -2 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C6 smd circle (at -2 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D6 smd circle (at -2 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E6 smd circle (at -2 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F6 smd circle (at -2 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G6 smd circle (at -2 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H6 smd circle (at -2 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J6 smd circle (at -2 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K6 smd circle (at -2 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L6 smd circle (at -2 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M6 smd circle (at -2 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N6 smd circle (at -2 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P6 smd circle (at -2 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R6 smd circle (at -2 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T6 smd circle (at -2 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A7 smd circle (at -1.2 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B7 smd circle (at -1.2 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C7 smd circle (at -1.2 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D7 smd circle (at -1.2 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E7 smd circle (at -1.2 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F7 smd circle (at -1.2 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G7 smd circle (at -1.2 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H7 smd circle (at -1.2 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J7 smd circle (at -1.2 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K7 smd circle (at -1.2 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L7 smd circle (at -1.2 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M7 smd circle (at -1.2 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N7 smd circle (at -1.2 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P7 smd circle (at -1.2 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R7 smd circle (at -1.2 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T7 smd circle (at -1.2 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A8 smd circle (at -0.4 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B8 smd circle (at -0.4 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C8 smd circle (at -0.4 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D8 smd circle (at -0.4 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E8 smd circle (at -0.4 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F8 smd circle (at -0.4 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G8 smd circle (at -0.4 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H8 smd circle (at -0.4 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J8 smd circle (at -0.4 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K8 smd circle (at -0.4 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L8 smd circle (at -0.4 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M8 smd circle (at -0.4 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N8 smd circle (at -0.4 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P8 smd circle (at -0.4 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R8 smd circle (at -0.4 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T8 smd circle (at -0.4 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A9 smd circle (at 0.4 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B9 smd circle (at 0.4 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C9 smd circle (at 0.4 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D9 smd circle (at 0.4 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E9 smd circle (at 0.4 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F9 smd circle (at 0.4 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G9 smd circle (at 0.4 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H9 smd circle (at 0.4 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J9 smd circle (at 0.4 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K9 smd circle (at 0.4 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L9 smd circle (at 0.4 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M9 smd circle (at 0.4 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N9 smd circle (at 0.4 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P9 smd circle (at 0.4 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R9 smd circle (at 0.4 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T9 smd circle (at 0.4 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A10 smd circle (at 1.2 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B10 smd circle (at 1.2 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C10 smd circle (at 1.2 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D10 smd circle (at 1.2 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E10 smd circle (at 1.2 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F10 smd circle (at 1.2 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G10 smd circle (at 1.2 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H10 smd circle (at 1.2 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J10 smd circle (at 1.2 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K10 smd circle (at 1.2 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L10 smd circle (at 1.2 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M10 smd circle (at 1.2 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N10 smd circle (at 1.2 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P10 smd circle (at 1.2 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R10 smd circle (at 1.2 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T10 smd circle (at 1.2 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A11 smd circle (at 2 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B11 smd circle (at 2 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C11 smd circle (at 2 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D11 smd circle (at 2 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E11 smd circle (at 2 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F11 smd circle (at 2 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G11 smd circle (at 2 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H11 smd circle (at 2 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J11 smd circle (at 2 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K11 smd circle (at 2 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L11 smd circle (at 2 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M11 smd circle (at 2 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N11 smd circle (at 2 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P11 smd circle (at 2 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R11 smd circle (at 2 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T11 smd circle (at 2 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A12 smd circle (at 2.8 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B12 smd circle (at 2.8 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C12 smd circle (at 2.8 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D12 smd circle (at 2.8 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E12 smd circle (at 2.8 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F12 smd circle (at 2.8 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G12 smd circle (at 2.8 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H12 smd circle (at 2.8 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J12 smd circle (at 2.8 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K12 smd circle (at 2.8 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L12 smd circle (at 2.8 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M12 smd circle (at 2.8 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N12 smd circle (at 2.8 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P12 smd circle (at 2.8 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R12 smd circle (at 2.8 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T12 smd circle (at 2.8 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A13 smd circle (at 3.6 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B13 smd circle (at 3.6 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C13 smd circle (at 3.6 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D13 smd circle (at 3.6 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E13 smd circle (at 3.6 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F13 smd circle (at 3.6 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G13 smd circle (at 3.6 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H13 smd circle (at 3.6 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J13 smd circle (at 3.6 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K13 smd circle (at 3.6 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L13 smd circle (at 3.6 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M13 smd circle (at 3.6 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N13 smd circle (at 3.6 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P13 smd circle (at 3.6 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R13 smd circle (at 3.6 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T13 smd circle (at 3.6 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A14 smd circle (at 4.4 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B14 smd circle (at 4.4 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C14 smd circle (at 4.4 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D14 smd circle (at 4.4 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E14 smd circle (at 4.4 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F14 smd circle (at 4.4 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G14 smd circle (at 4.4 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H14 smd circle (at 4.4 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J14 smd circle (at 4.4 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K14 smd circle (at 4.4 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L14 smd circle (at 4.4 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M14 smd circle (at 4.4 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N14 smd circle (at 4.4 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P14 smd circle (at 4.4 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R14 smd circle (at 4.4 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T14 smd circle (at 4.4 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A15 smd circle (at 5.2 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B15 smd circle (at 5.2 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C15 smd circle (at 5.2 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D15 smd circle (at 5.2 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E15 smd circle (at 5.2 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F15 smd circle (at 5.2 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G15 smd circle (at 5.2 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H15 smd circle (at 5.2 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J15 smd circle (at 5.2 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K15 smd circle (at 5.2 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L15 smd circle (at 5.2 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M15 smd circle (at 5.2 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N15 smd circle (at 5.2 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P15 smd circle (at 5.2 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R15 smd circle (at 5.2 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T15 smd circle (at 5.2 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad A16 smd circle (at 6 -6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad B16 smd circle (at 6 -5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad C16 smd circle (at 6 -4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad D16 smd circle (at 6 -3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad E16 smd circle (at 6 -2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad F16 smd circle (at 6 -2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad G16 smd circle (at 6 -1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad H16 smd circle (at 6 -0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad J16 smd circle (at 6 0.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad K16 smd circle (at 6 1.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad L16 smd circle (at 6 2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad M16 smd circle (at 6 2.8) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad N16 smd circle (at 6 3.6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad P16 smd circle (at 6 4.4) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad R16 smd circle (at 6 5.2) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (pad T16 smd circle (at 6 6) (size 0.32 0.32) (layers F.Cu F.Paste F.Mask))
-  (model ${KISYS3DMOD}/Package_BGA.3dshapes/BGA-256_14.0x14.0mm_Layout16x16_P0.8mm_Ball0.45mm_Pad0.32mm_NSMD.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
diff --git a/BelFuse_1206.kicad_mod b/BelFuse_1206.kicad_mod
index 4dccda4..894d6ab 100644
--- a/BelFuse_1206.kicad_mod
+++ b/BelFuse_1206.kicad_mod
@@ -1,5 +1,6 @@
-(module BelFuse_1206 (layer F.Cu) (tedit 5C672ACF)
+(module BelFuse_1206 (layer F.Cu) (tedit 5CFD71DE)
   (tags "PTC fuse")
+  (attr smd)
   (fp_text reference F101 (at 0 1.6 -180) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
diff --git a/BelFuse_1210.kicad_mod b/BelFuse_1210.kicad_mod
index 6942ebc..1373185 100644
--- a/BelFuse_1210.kicad_mod
+++ b/BelFuse_1210.kicad_mod
@@ -1,5 +1,6 @@
-(module BelFuse_1210 (layer F.Cu) (tedit 5C672CDF)
+(module BelFuse_1210 (layer F.Cu) (tedit 5CF5D394)
   (tags "PTC fuse")
+  (attr smd)
   (fp_text reference F101 (at 0 2.1 -180) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
diff --git a/CP_Elec_10mm.kicad_mod b/CP_Elec_10mm.kicad_mod
index 8dcc60d..538c1a3 100644
--- a/CP_Elec_10mm.kicad_mod
+++ b/CP_Elec_10mm.kicad_mod
@@ -1,4 +1,4 @@
-(module CP_Elec_10mm (layer F.Cu) (tedit 5BD63274)
+(module CP_Elec_10mm (layer F.Cu) (tedit 5CF821FB)
   (tags "Capacitor Electrolytic")
   (attr smd)
   (fp_text reference REF** (at 0 -5.75) (layer F.SilkS)
@@ -43,8 +43,8 @@
   (fp_text user %R (at 0 0 90) (layer F.Fab)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
-  (pad 1 smd rect (at -4.2 0) (size 4.4 2.5) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 4.2 0) (size 4.4 2.5) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd roundrect (at -4.2 0) (size 4.4 2.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 4.2 0) (size 4.4 2.5) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/CP_Elec_10x10.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
diff --git a/C_0402.kicad_mod b/C_0402.kicad_mod
index 1f93789..01a72b5 100644
--- a/C_0402.kicad_mod
+++ b/C_0402.kicad_mod
@@ -1,4 +1,4 @@
-(module C_0402 (layer F.Cu) (tedit 5BD63288)
+(module C_0402 (layer F.Cu) (tedit 5CF70CB9)
   (tags capacitor)
   (attr smd)
   (fp_text reference REF** (at 0 -0.85) (layer F.SilkS)
@@ -18,8 +18,8 @@
   (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.05))
   (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.05))
   (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.05))
-  (pad 2 smd roundrect (at 0.45 0) (size 0.6 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -0.45 0) (size 0.6 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5 0) (size 0.6 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.5 0) (size 0.6 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
diff --git a/DIP-32_W15.24mm_Socket_LongPads.kicad_mod b/DIP-32_W15.24mm_Socket_LongPads.kicad_mod
new file mode 100644
index 0000000..d8d6995
--- /dev/null
+++ b/DIP-32_W15.24mm_Socket_LongPads.kicad_mod
@@ -0,0 +1,73 @@
+(module DIP-32_W15.24mm_Socket_LongPads (layer F.Cu) (tedit 5CFD7B14)
+  (descr "32-lead though-hole mounted DIP package, row spacing 15.24 mm (600 mils), Socket, LongPads")
+  (tags "THT DIP DIL PDIP 2.54mm 15.24mm 600mil Socket LongPads")
+  (fp_text reference REF** (at 7.62 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value DIP-32_W15.24mm_Socket_LongPads (at 7.62 40.43) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_arc (start 7.62 -1.33) (end 6.62 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.255 -1.27) (end 14.985 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 14.985 -1.27) (end 14.985 39.37) (layer F.Fab) (width 0.1))
+  (fp_line (start 14.985 39.37) (end 0.255 39.37) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.255 39.37) (end 0.255 -0.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.255 -0.27) (end 1.255 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.33) (end -1.27 39.43) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 39.43) (end 16.51 39.43) (layer F.Fab) (width 0.1))
+  (fp_line (start 16.51 39.43) (end 16.51 -1.33) (layer F.Fab) (width 0.1))
+  (fp_line (start 16.51 -1.33) (end -1.27 -1.33) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.62 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.56 -1.33) (end 1.56 39.43) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.56 39.43) (end 13.68 39.43) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13.68 39.43) (end 13.68 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13.68 -1.33) (end 8.62 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.44 -1.39) (end -1.44 39.49) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.44 39.49) (end 16.68 39.49) (layer F.SilkS) (width 0.12))
+  (fp_line (start 16.68 39.49) (end 16.68 -1.39) (layer F.SilkS) (width 0.12))
+  (fp_line (start 16.68 -1.39) (end -1.44 -1.39) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.55 -1.6) (end -1.55 39.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.55 39.7) (end 16.8 39.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 16.8 39.7) (end 16.8 -1.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 16.8 -1.6) (end -1.55 -1.6) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 7.62 19.05) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole rect (at 0 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 17 thru_hole oval (at 15.24 38.1) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 18 thru_hole oval (at 15.24 35.56) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 19 thru_hole oval (at 15.24 33.02) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 20 thru_hole oval (at 15.24 30.48) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 21 thru_hole oval (at 15.24 27.94) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 22 thru_hole oval (at 15.24 25.4) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 23 thru_hole oval (at 15.24 22.86) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 24 thru_hole oval (at 15.24 20.32) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 25 thru_hole oval (at 15.24 17.78) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 26 thru_hole oval (at 15.24 15.24) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 25.4) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 27 thru_hole oval (at 15.24 12.7) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at 0 27.94) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 28 thru_hole oval (at 15.24 10.16) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 13 thru_hole oval (at 0 30.48) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 29 thru_hole oval (at 15.24 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 14 thru_hole oval (at 0 33.02) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 30 thru_hole oval (at 15.24 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 15 thru_hole oval (at 0 35.56) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 31 thru_hole oval (at 15.24 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 16 thru_hole oval (at 0 38.1) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 32 thru_hole oval (at 15.24 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-32_W15.24mm_Socket.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/Fiducial.kicad_mod b/Fiducial.kicad_mod
index 982b5d4..9365ff9 100644
--- a/Fiducial.kicad_mod
+++ b/Fiducial.kicad_mod
@@ -1,7 +1,7 @@
-(module Fiducial (layer F.Cu) (tedit 5CC28239)
+(module Fiducial (layer F.Cu) (tedit 5CFD71CD)
   (descr "Circular Fiducial, 1mm bare copper top; 2mm keepout (Level A)")
   (tags marker)
-  (attr virtual)
+  (attr smd)
   (fp_text reference REF** (at 0 -1.6) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
diff --git a/LPSeries-Screw.kicad_mod b/LPSeries-Screw.kicad_mod
index f8d1aa7..854aff8 100644
--- a/LPSeries-Screw.kicad_mod
+++ b/LPSeries-Screw.kicad_mod
@@ -1,78 +1,47 @@
-(module LPSeries-Screw locked (layer F.Cu) (tedit 5C60E3AC)
+(module LPSeries-Screw locked (layer F.Cu) (tedit 5CFD7586)
   (solder_paste_margin -0.05)
-  (fp_text reference S1 (at 0 -4) (layer F.SilkS) hide
-    (effects (font (size 1 1) (thickness 0.15)))
+  (attr virtual)
+  (fp_text reference H2 (at -0.0046 -3.4026) (layer F.SilkS)
+    (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
   (fp_text value LPSeries-Screw (at 0 4) (layer F.Fab) hide
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_arc (start -1.55 -1.55) (end -1.35 -1.75) (angle -180) (layer B.Mask) (width 0.4))
-  (fp_arc (start -2.2 0) (end -2.2 0.25) (angle 180) (layer B.Mask) (width 0.45))
-  (fp_arc (start -1.55 1.55) (end -1.35 1.75) (angle 180) (layer B.Mask) (width 0.4))
-  (fp_arc (start 0 2.2) (end 0.25 2.2) (angle 180) (layer B.Mask) (width 0.45))
-  (fp_arc (start 1.55 1.55) (end 1.35 1.75) (angle -180) (layer B.Mask) (width 0.4))
-  (fp_arc (start 2.2 0) (end 2.2 0.25) (angle -180) (layer B.Mask) (width 0.45))
-  (fp_arc (start 1.55 -1.55) (end 1.35 -1.75) (angle 180) (layer B.Mask) (width 0.4))
-  (fp_arc (start 0 -2.2) (end 0.25 -2.2) (angle -180) (layer B.Mask) (width 0.45))
-  (fp_arc (start 1.55 -1.55) (end 1.35 -1.75) (angle 180) (layer F.Mask) (width 0.4))
-  (fp_arc (start -1.55 1.55) (end -1.35 1.75) (angle 180) (layer F.Mask) (width 0.4))
-  (fp_arc (start 1.55 1.55) (end 1.35 1.75) (angle -180) (layer F.Mask) (width 0.4))
-  (fp_arc (start -1.55 -1.55) (end -1.35 -1.75) (angle -180) (layer F.Mask) (width 0.4))
-  (fp_arc (start -2.2 0) (end -2.2 0.25) (angle 180) (layer F.Mask) (width 0.45))
-  (fp_arc (start 2.2 0) (end 2.2 0.25) (angle -180) (layer F.Mask) (width 0.45))
-  (fp_arc (start 0 2.2) (end 0.25 2.2) (angle 180) (layer F.Mask) (width 0.45))
-  (fp_arc (start 0 -2.2) (end 0.25 -2.2) (angle -180) (layer F.Mask) (width 0.45))
-  (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.1))
-  (fp_circle (center 0 0) (end 0.1 0) (layer F.Mask) (width 4.2))
   (fp_circle (center 0 0) (end 0.1 0) (layer B.Mask) (width 4.2))
-  (pad 1 smd roundrect (at 1.9 -1.9 45) (size 0.3 0.2) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 2.7 0) (size 0.3 0.2) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 1.9 1.9 315) (size 0.3 0.2) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 0 2.7) (size 0.2 0.3) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at -1.9 1.9 225) (size 0.3 0.2) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at -2.7 0) (size 0.3 0.2) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at -1.9 -1.9 135) (size 0.3 0.2) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 0 -2.7) (size 0.2 0.3) (layers B.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 1.9 1.9 315) (size 0.3 0.2) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at -1.9 1.9 225) (size 0.3 0.2) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at -1.9 -1.9 135) (size 0.3 0.2) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 1.9 -1.9 45) (size 0.3 0.2) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 0 2.7) (size 0.2 0.3) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 0 -2.7) (size 0.2 0.3) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at -2.7 0) (size 0.3 0.2) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 smd roundrect (at 2.7 0) (size 0.3 0.2) (layers F.Cu) (roundrect_rratio 0.25)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 0 0) (size 4.2 4.2) (drill 3.3) (layers *.Cu *.Mask)
-    (solder_mask_margin -0.45) (zone_connect 2))
-  (pad 1 thru_hole circle (at 0 -2.2) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 2.2 0) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 0 2.2) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at -2.2 0) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at -1.55 -1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 1.55 -1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
+  (fp_circle (center 0 0) (end 0.1 0) (layer F.Mask) (width 4.2))
+  (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.05))
+  (fp_arc (start 0 -2.2) (end 0.25 -2.2) (angle -180) (layer F.Mask) (width 0.45))
+  (fp_arc (start 0 2.2) (end 0.25 2.2) (angle 180) (layer F.Mask) (width 0.45))
+  (fp_arc (start 2.2 0) (end 2.2 0.25) (angle -180) (layer F.Mask) (width 0.45))
+  (fp_arc (start -2.2 0) (end -2.2 0.25) (angle 180) (layer F.Mask) (width 0.45))
+  (fp_arc (start -1.55 -1.55) (end -1.35 -1.75) (angle -180) (layer F.Mask) (width 0.4))
+  (fp_arc (start 1.55 1.55) (end 1.35 1.75) (angle -180) (layer F.Mask) (width 0.4))
+  (fp_arc (start -1.55 1.55) (end -1.35 1.75) (angle 180) (layer F.Mask) (width 0.4))
+  (fp_arc (start 1.55 -1.55) (end 1.35 -1.75) (angle 180) (layer F.Mask) (width 0.4))
+  (fp_arc (start 0 -2.2) (end 0.25 -2.2) (angle -180) (layer B.Mask) (width 0.45))
+  (fp_arc (start 1.55 -1.55) (end 1.35 -1.75) (angle 180) (layer B.Mask) (width 0.4))
+  (fp_arc (start 2.2 0) (end 2.2 0.25) (angle -180) (layer B.Mask) (width 0.45))
+  (fp_arc (start 1.55 1.55) (end 1.35 1.75) (angle -180) (layer B.Mask) (width 0.4))
+  (fp_arc (start 0 2.2) (end 0.25 2.2) (angle 180) (layer B.Mask) (width 0.45))
+  (fp_arc (start -1.55 1.55) (end -1.35 1.75) (angle 180) (layer B.Mask) (width 0.4))
+  (fp_arc (start -2.2 0) (end -2.2 0.25) (angle 180) (layer B.Mask) (width 0.45))
+  (fp_arc (start -1.55 -1.55) (end -1.35 -1.75) (angle -180) (layer B.Mask) (width 0.4))
+  (pad 1 thru_hole circle (at -1.55 1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
     (zone_connect 2))
   (pad 1 thru_hole circle (at 1.55 1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
     (zone_connect 2))
-  (pad 1 thru_hole circle (at -1.55 1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
+  (pad 1 thru_hole circle (at 1.55 -1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
     (zone_connect 2))
+  (pad 1 thru_hole circle (at -1.55 -1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
+    (zone_connect 2))
+  (pad 1 thru_hole circle (at -2.2 0) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
+    (zone_connect 2))
+  (pad 1 thru_hole circle (at 0 2.2) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
+    (zone_connect 2))
+  (pad 1 thru_hole circle (at 2.2 0) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
+    (zone_connect 2))
+  (pad 1 thru_hole circle (at 0 -2.2) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
+    (zone_connect 2))
+  (pad 1 thru_hole circle (at 0 0) (size 4.2 4.2) (drill 3.3) (layers *.Cu *.Mask)
+    (solder_mask_margin -0.45) (zone_connect 2))
 )
diff --git a/LPSeries-Screw_Notabs.kicad_mod b/LPSeries-Screw_Notabs.kicad_mod
deleted file mode 100644
index 1087e0a..0000000
--- a/LPSeries-Screw_Notabs.kicad_mod
+++ /dev/null
@@ -1,46 +0,0 @@
-(module LPSeries-Screw_Notabs locked (layer F.Cu) (tedit 5C64A67B)
-  (solder_paste_margin -0.05)
-  (fp_text reference H2 (at -0.0046 -3.4026) (layer F.SilkS)
-    (effects (font (size 0.508 0.508) (thickness 0.127)))
-  )
-  (fp_text value " " (at 0 4) (layer F.Fab) hide
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_circle (center 0 0) (end 0.1 0) (layer B.Mask) (width 4.2))
-  (fp_circle (center 0 0) (end 0.1 0) (layer F.Mask) (width 4.2))
-  (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.05))
-  (fp_arc (start 0 -2.2) (end 0.25 -2.2) (angle -180) (layer F.Mask) (width 0.45))
-  (fp_arc (start 0 2.2) (end 0.25 2.2) (angle 180) (layer F.Mask) (width 0.45))
-  (fp_arc (start 2.2 0) (end 2.2 0.25) (angle -180) (layer F.Mask) (width 0.45))
-  (fp_arc (start -2.2 0) (end -2.2 0.25) (angle 180) (layer F.Mask) (width 0.45))
-  (fp_arc (start -1.55 -1.55) (end -1.35 -1.75) (angle -180) (layer F.Mask) (width 0.4))
-  (fp_arc (start 1.55 1.55) (end 1.35 1.75) (angle -180) (layer F.Mask) (width 0.4))
-  (fp_arc (start -1.55 1.55) (end -1.35 1.75) (angle 180) (layer F.Mask) (width 0.4))
-  (fp_arc (start 1.55 -1.55) (end 1.35 -1.75) (angle 180) (layer F.Mask) (width 0.4))
-  (fp_arc (start 0 -2.2) (end 0.25 -2.2) (angle -180) (layer B.Mask) (width 0.45))
-  (fp_arc (start 1.55 -1.55) (end 1.35 -1.75) (angle 180) (layer B.Mask) (width 0.4))
-  (fp_arc (start 2.2 0) (end 2.2 0.25) (angle -180) (layer B.Mask) (width 0.45))
-  (fp_arc (start 1.55 1.55) (end 1.35 1.75) (angle -180) (layer B.Mask) (width 0.4))
-  (fp_arc (start 0 2.2) (end 0.25 2.2) (angle 180) (layer B.Mask) (width 0.45))
-  (fp_arc (start -1.55 1.55) (end -1.35 1.75) (angle 180) (layer B.Mask) (width 0.4))
-  (fp_arc (start -2.2 0) (end -2.2 0.25) (angle 180) (layer B.Mask) (width 0.45))
-  (fp_arc (start -1.55 -1.55) (end -1.35 -1.75) (angle -180) (layer B.Mask) (width 0.4))
-  (pad 1 thru_hole circle (at -1.55 1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 1.55 1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 1.55 -1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at -1.55 -1.55) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at -2.2 0) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 0 2.2) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 2.2 0) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 0 -2.2) (size 0.8 0.8) (drill 0.3) (layers *.Cu *.Paste *.Mask)
-    (zone_connect 2))
-  (pad 1 thru_hole circle (at 0 0) (size 4.2 4.2) (drill 3.3) (layers *.Cu *.Mask)
-    (solder_mask_margin -0.45) (zone_connect 2))
-)
diff --git a/M2Nut_Soldered.kicad_mod b/M2Nut_Soldered.kicad_mod
index 00a8437..c0ad74a 100644
--- a/M2Nut_Soldered.kicad_mod
+++ b/M2Nut_Soldered.kicad_mod
@@ -1,4 +1,5 @@
-(module M2Nut_Soldered (layer F.Cu) (tedit 5C8EDFEE)
+(module M2Nut_Soldered (layer F.Cu) (tedit 5CFD765E)
+  (attr smd)
   (fp_text reference REF** (at 0 -5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/M3Nut_Soldered.kicad_mod b/M3Nut_Soldered.kicad_mod
index 70b15c6..70f2a7e 100644
--- a/M3Nut_Soldered.kicad_mod
+++ b/M3Nut_Soldered.kicad_mod
@@ -1,4 +1,5 @@
-(module M3Nut_Soldered (layer F.Cu) (tedit 5C92E846)
+(module M3Nut_Soldered (layer F.Cu) (tedit 5CFD765A)
+  (attr smd)
   (fp_text reference REF** (at 0 -5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/M3Nut_Soldered_BoardEdge.kicad_mod b/M3Nut_Soldered_BoardEdge.kicad_mod
index efb64a8..66e96cb 100644
--- a/M3Nut_Soldered_BoardEdge.kicad_mod
+++ b/M3Nut_Soldered_BoardEdge.kicad_mod
@@ -1,4 +1,5 @@
-(module M3Nut_Soldered_BoardEdge (layer F.Cu) (tedit 5C92EFD8)
+(module M3Nut_Soldered_BoardEdge (layer F.Cu) (tedit 5CFD7662)
+  (attr smd)
   (fp_text reference REF** (at 0 -5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Maxim_QFN-32-1EP_5x5mm_T3255+4.kicad_mod b/Maxim_QFN-32-1EP_5x5mm_T3255+4.kicad_mod
index bbb5054..c7a0427 100644
--- a/Maxim_QFN-32-1EP_5x5mm_T3255+4.kicad_mod
+++ b/Maxim_QFN-32-1EP_5x5mm_T3255+4.kicad_mod
@@ -1,4 +1,4 @@
-(module Maxim_QFN-32-1EP_5x5mm_T3255+4 (layer F.Cu) (tedit 5C706794)
+(module Maxim_QFN-32-1EP_5x5mm_T3255+4 (layer F.Cu) (tedit 5CF81CD1)
   (tags QFN-32)
   (attr smd)
   (fp_text reference REF** (at 0 -3.55) (layer F.SilkS)
@@ -26,65 +26,68 @@
   (fp_line (start -2.135 2.61) (end -2.61 2.61) (layer F.SilkS) (width 0.12))
   (fp_line (start 2.61 -2.61) (end 2.61 -2.135) (layer F.SilkS) (width 0.12))
   (fp_line (start 2.135 -2.61) (end 2.61 -2.61) (layer F.SilkS) (width 0.12))
-  (pad 32 smd roundrect (at -1.75 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 31 smd roundrect (at -1.25 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 30 smd roundrect (at -0.75 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 29 smd roundrect (at -0.25 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 28 smd roundrect (at 0.25 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 27 smd roundrect (at 0.75 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 26 smd roundrect (at 1.25 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 25 smd roundrect (at 1.75 -2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 24 smd roundrect (at 2.45 -1.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 23 smd roundrect (at 2.45 -1.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 22 smd roundrect (at 2.45 -0.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 21 smd roundrect (at 2.45 -0.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 20 smd roundrect (at 2.45 0.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 19 smd roundrect (at 2.45 0.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 18 smd roundrect (at 2.45 1.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 17 smd roundrect (at 2.45 1.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 16 smd roundrect (at 1.75 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 15 smd roundrect (at 1.25 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 14 smd roundrect (at 0.75 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 13 smd roundrect (at 0.25 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 12 smd roundrect (at -0.25 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 11 smd roundrect (at -0.75 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 10 smd roundrect (at -1.25 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 9 smd roundrect (at -1.75 2.45) (size 0.25 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 8 smd roundrect (at -2.45 1.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 7 smd roundrect (at -2.45 1.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at -2.45 0.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 5 smd roundrect (at -2.45 0.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 4 smd roundrect (at -2.45 -0.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 3 smd roundrect (at -2.45 -0.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at -2.45 -1.25) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -2.45 -1.75) (size 0.9 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 32 smd roundrect (at -1.75 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 31 smd roundrect (at -1.25 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 30 smd roundrect (at -0.75 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 29 smd roundrect (at -0.25 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 28 smd roundrect (at 0.25 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 27 smd roundrect (at 0.75 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 26 smd roundrect (at 1.25 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 25 smd roundrect (at 1.75 -2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 24 smd roundrect (at 2.45 -1.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 23 smd roundrect (at 2.45 -1.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 22 smd roundrect (at 2.45 -0.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 21 smd roundrect (at 2.45 -0.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 20 smd roundrect (at 2.45 0.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 19 smd roundrect (at 2.45 0.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 18 smd roundrect (at 2.45 1.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 17 smd roundrect (at 2.45 1.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at 1.75 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at 1.25 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 0.75 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 0.25 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at -0.25 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at -0.75 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at -1.25 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at -1.75 2.45) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at -2.45 1.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at -2.45 1.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -2.45 0.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -2.45 0.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -2.45 -0.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -2.45 -0.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at -2.45 -1.25) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -2.45 -1.75) (size 0.9 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (pad "" smd custom (at 1.275 1.275) (size 0.318785 0.318785) (layers F.Paste)
     (zone_connect 0)
     (options (clearance outline) (anchor circle))
     (primitives
       (gr_poly (pts
-         (xy -0.221712 -0.045445) (xy -0.045445 -0.221712) (xy 0.221712 -0.221712) (xy 0.221712 0.221712) (xy -0.221712 0.221712)
+         (xy -0.221712 -0.045445) (xy -0.045445 -0.221712) (xy 0.19 -0.221712) (xy 0.19 0.19) (xy -0.221712 0.19)
 ) (width 0))
     ))
   (pad "" smd custom (at 1.275 -1.275) (size 0.318785 0.318785) (layers F.Paste)
+    (zone_connect 0)
     (options (clearance outline) (anchor circle))
     (primitives
       (gr_poly (pts
-         (xy -0.221712 -0.221712) (xy 0.221712 -0.221712) (xy 0.221712 0.221712) (xy -0.045445 0.221712) (xy -0.221712 0.045445)
+         (xy -0.221712 -0.19) (xy 0.19 -0.19) (xy 0.19 0.221712) (xy -0.045445 0.221712) (xy -0.221712 0.045445)
 ) (width 0))
     ))
   (pad "" smd custom (at -1.275 1.275) (size 0.318785 0.318785) (layers F.Paste)
+    (zone_connect 0)
     (options (clearance outline) (anchor circle))
     (primitives
       (gr_poly (pts
-         (xy -0.221712 -0.221712) (xy 0.045445 -0.221712) (xy 0.221712 -0.045445) (xy 0.221712 0.221712) (xy -0.221712 0.221712)
+         (xy -0.19 -0.221712) (xy 0.045445 -0.221712) (xy 0.221712 -0.045445) (xy 0.221712 0.19) (xy -0.19 0.19)
 ) (width 0))
     ))
   (pad "" smd custom (at -1.275 -1.275) (size 0.318785 0.318785) (layers F.Paste)
+    (zone_connect 0)
     (options (clearance outline) (anchor circle))
     (primitives
       (gr_poly (pts
-         (xy -0.221712 -0.221712) (xy 0.221712 -0.221712) (xy 0.221712 0.045445) (xy 0.045445 0.221712) (xy -0.221712 0.221712)
+         (xy -0.19 -0.19) (xy 0.221712 -0.19) (xy 0.221712 0.045445) (xy 0.045445 0.221712) (xy -0.19 0.221712)
 ) (width 0))
     ))
   (pad "" smd custom (at 0.5 1.275) (size 0.349614 0.349614) (layers F.Paste)
@@ -167,7 +170,7 @@
     (zone_connect 2))
   (pad 33 thru_hole circle (at -1 -1) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
     (zone_connect 2))
-  (pad 33 smd roundrect (at 0 0) (size 3.1 3.1) (layers F.Cu F.Mask) (roundrect_rratio 0.081)
+  (pad 33 smd roundrect (at 0 0) (size 3.15 3.15) (layers F.Cu F.Mask) (roundrect_rratio 0.081)
     (zone_connect 0))
   (model ${KISYS3DMOD}/Package_DFN_QFN.3dshapes/QFN-32-1EP_5x5mm_P0.5mm_EP3.45x3.45mm.wrl
     (at (xyz 0 0 0))
diff --git a/Molex_473521001_microSD.kicad_mod b/Molex_473521001_microSD.kicad_mod
index ba4d3c0..636515b 100644
--- a/Molex_473521001_microSD.kicad_mod
+++ b/Molex_473521001_microSD.kicad_mod
@@ -1,4 +1,5 @@
-(module Molex_473521001_microSD (layer F.Cu) (tedit 5CA94748)
+(module Molex_473521001_microSD (layer F.Cu) (tedit 5CFD75C8)
+  (attr smd)
   (fp_text reference REF** (at 0.91 0.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/NPTH_0.4mm.kicad_mod b/NPTH_0.4mm.kicad_mod
index 24162e4..1b4d786 100644
--- a/NPTH_0.4mm.kicad_mod
+++ b/NPTH_0.4mm.kicad_mod
@@ -1,4 +1,5 @@
-(module NPTH_0.4mm (layer F.Cu) (tedit 5C47899B)
+(module NPTH_0.4mm (layer F.Cu) (tedit 5CFD758E)
+  (attr virtual)
   (fp_text reference REF** (at 0 0.5) (layer F.SilkS) hide
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/NXP_DHVFQFN-20_SOT764-1.kicad_mod b/NXP_DHVFQFN-20_SOT764-1.kicad_mod
index fdb7ed0..11dabc0 100644
--- a/NXP_DHVFQFN-20_SOT764-1.kicad_mod
+++ b/NXP_DHVFQFN-20_SOT764-1.kicad_mod
@@ -1,4 +1,4 @@
-(module NXP_DHVFQFN-20_SOT764-1 (layer F.Cu) (tedit 5C84A6AB)
+(module NXP_DHVFQFN-20_SOT764-1 (layer F.Cu) (tedit 5CFD6909)
   (solder_paste_margin -0.025)
   (fp_text reference REF** (at 0 -2.5) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
@@ -35,7 +35,7 @@
   (pad 3 smd roundrect (at -1.25 1.3) (size 0.24 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (pad 2 smd roundrect (at -1.75 1.3) (size 0.24 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (pad 21 smd roundrect (at 0 0) (size 2.9 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.05)
-    (solder_paste_margin -0.28))
+    (solder_paste_margin -0.28) (zone_connect 2))
   (pad 7 smd roundrect (at 0.75 1.3) (size 0.24 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (pad 8 smd roundrect (at 1.25 1.3) (size 0.24 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (pad 9 smd roundrect (at 1.75 1.3) (size 0.24 0.9) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
diff --git a/ONSemi_UDFN-10_1.35x2.6mm_P0.5mm_517BB.kicad_mod b/ONSemi_UDFN-10_1.35x2.6mm_P0.5mm_517BB.kicad_mod
index c9e10c3..b9291a1 100644
--- a/ONSemi_UDFN-10_1.35x2.6mm_P0.5mm_517BB.kicad_mod
+++ b/ONSemi_UDFN-10_1.35x2.6mm_P0.5mm_517BB.kicad_mod
@@ -1,6 +1,7 @@
-(module ONSemi_UDFN-10_1.35x2.6mm_P0.5mm_517BB (layer F.Cu) (tedit 5C1B3033)
+(module ONSemi_UDFN-10_1.35x2.6mm_P0.5mm_517BB (layer F.Cu) (tedit 5CF82049)
   (descr http://www.st.com/content/ccc/resource/technical/document/datasheet/f2/11/8a/ed/40/31/40/56/DM00088292.pdf/files/DM00088292.pdf/jcr:content/translations/en.DM00088292.pdf)
   (tags "UDFN 0.5 uQFN")
+  (solder_mask_margin 0.03175)
   (attr smd)
   (fp_text reference REF** (at 0 -1.9) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
@@ -22,16 +23,24 @@
   (fp_line (start -1.15 1.5) (end 1.15 1.5) (layer F.CrtYd) (width 0.05))
   (fp_line (start -0.45 1.36) (end 0.45 1.36) (layer F.SilkS) (width 0.12))
   (fp_line (start -0.675 -1.36) (end 0.45 -1.36) (layer F.SilkS) (width 0.12))
-  (pad 1 smd roundrect (at -0.5 -1) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at -0.5 -0.5) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 3 smd roundrect (at -0.5 0) (size 0.8 0.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 4 smd roundrect (at -0.5 0.5) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 5 smd roundrect (at -0.5 1) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at 0.5 1) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 7 smd roundrect (at 0.5 0.5) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 8 smd roundrect (at 0.5 0) (size 0.8 0.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 9 smd roundrect (at 0.5 -0.5) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 10 smd roundrect (at 0.5 -1) (size 0.8 0.2) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.55 -1) (size 0.8 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
+  (pad 2 smd roundrect (at -0.55 -0.5) (size 0.8 0.225) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
+  (pad 3 smd roundrect (at -0.55 0) (size 0.8 0.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -0.55 0.5) (size 0.8 0.225) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
+  (pad 5 smd roundrect (at -0.55 1) (size 0.8 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
+  (pad 6 smd roundrect (at 0.55 1) (size 0.8 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
+  (pad 7 smd roundrect (at 0.55 0.5) (size 0.8 0.225) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
+  (pad 8 smd roundrect (at 0.55 0) (size 0.8 0.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 0.55 -0.5) (size 0.8 0.225) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
+  (pad 10 smd roundrect (at 0.55 -1) (size 0.8 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (solder_paste_margin -0.0254))
   (model ${KISYS3DMOD}/Package_DFN_QFN.3dshapes/UDFN-10_1.35x2.6mm_P0.5mm.wrl
     (at (xyz 0 0 0))
     (scale (xyz 0.74074074074 1 1))
diff --git a/PasteHole_1.05mm_NPTH.kicad_mod b/PasteHole_1.05mm_NPTH.kicad_mod
new file mode 100644
index 0000000..0c97f55
--- /dev/null
+++ b/PasteHole_1.05mm_NPTH.kicad_mod
@@ -0,0 +1,17 @@
+(module PasteHole_1.05mm_NPTH (layer F.Cu) (tedit 5CF5C267)
+  (descr "Circular Fiducial, 1mm bare copper top; 2mm keepout (Level A)")
+  (tags marker)
+  (attr virtual)
+  (fp_text reference REF** (at 0 -1.651) (layer F.SilkS)
+    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  )
+  (fp_text value " " (at 0 2) (layer F.Fab) hide
+    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  )
+  (fp_circle (center 0 0) (end 1.25 0) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.4 0.4) (thickness 0.06)))
+  )
+  (fp_circle (center 0 0) (end 1 0) (layer F.Fab) (width 0.1))
+  (pad "" np_thru_hole oval (at 0 0) (size 1.05 1.05) (drill 1.05) (layers *.Cu *.Mask))
+)
diff --git a/PasteHole_1.05mm_PTH.kicad_mod b/PasteHole_1.05mm_PTH.kicad_mod
new file mode 100644
index 0000000..fc297d2
--- /dev/null
+++ b/PasteHole_1.05mm_PTH.kicad_mod
@@ -0,0 +1,19 @@
+(module PasteHole_1.05mm_PTH (layer F.Cu) (tedit 5CF5C271)
+  (descr "Circular Fiducial, 1mm bare copper top; 2mm keepout (Level A)")
+  (tags marker)
+  (zone_connect 2)
+  (attr virtual)
+  (fp_text reference REF** (at 0 -1.6) (layer F.SilkS)
+    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  )
+  (fp_text value " " (at 0 2) (layer F.Fab) hide
+    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  )
+  (fp_circle (center 0 0) (end 1 0) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.4 0.4) (thickness 0.06)))
+  )
+  (fp_circle (center 0 0) (end 1.25 0) (layer F.CrtYd) (width 0.05))
+  (pad 1 thru_hole circle (at 0 0) (size 2 2) (drill 1.05) (layers *.Cu *.Mask)
+    (zone_connect 2))
+)
diff --git a/PinHeader_2x05_P2.54mm_Vertical.kicad_mod b/PinHeader_2x05_P2.54mm_Vertical.kicad_mod
new file mode 100644
index 0000000..357f656
--- /dev/null
+++ b/PinHeader_2x05_P2.54mm_Vertical.kicad_mod
@@ -0,0 +1,45 @@
+(module PinHeader_2x05_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC)
+  (descr "Through hole straight pin header, 2x05, 2.54mm pitch, double rows")
+  (tags "Through hole pin header THT 2x05 2.54mm double row")
+  (fp_text reference REF** (at 1.27 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_2x05_P2.54mm_Vertical (at 1.27 12.49) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 0 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 3.81 11.43) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 11.43) (end -1.27 11.43) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 11.43) (end -1.27 0) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 0) (end 0 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.33 11.49) (end 3.87 11.49) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.33 1.27) (end -1.33 11.49) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.87 -1.33) (end 3.87 11.49) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.33 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 -1.33) (end 3.87 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 11.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 11.95) (end 4.35 11.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 4.35 11.95) (end 4.35 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 4.35 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 1.27 5.08 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 2.54 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 2.54 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 2.54 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x05_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/PowerTestPoint.kicad_mod b/PowerTestPoint.kicad_mod
deleted file mode 100644
index f5ee742..0000000
--- a/PowerTestPoint.kicad_mod
+++ /dev/null
@@ -1,43 +0,0 @@
-(module PowerTestPoint (layer F.Cu) (tedit 5C68B189)
-  (attr smd)
-  (fp_text reference REF** (at 0 3.1) (layer F.SilkS)
-    (effects (font (size 0.508 0.508) (thickness 0.127)))
-  )
-  (fp_text value PowerTestPoint_Paste (at 0 -3.1 180) (layer F.SilkS)
-    (effects (font (size 0.508 0.508) (thickness 0.127)))
-  )
-  (fp_line (start -2 2.7) (end -2 -2.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2 -2.7) (end 2 2.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2 -2.7) (end 2 -2.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2 2.7) (end 2 2.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -0.8 -1.05) (end -0.8 -1.85) (layer F.Fab) (width 0.05))
-  (fp_line (start 0.8 -1.05) (end -0.8 -1.05) (layer F.Fab) (width 0.05))
-  (fp_line (start -0.35 -2.5) (end 0.35 -2.5) (layer F.SilkS) (width 0.127))
-  (fp_line (start 0.8 -1.85) (end 0.8 -1.05) (layer F.Fab) (width 0.05))
-  (fp_line (start 0.35 -0.4) (end -0.35 -0.4) (layer F.SilkS) (width 0.127))
-  (fp_line (start -0.8 -1.85) (end 0.8 -1.85) (layer F.Fab) (width 0.05))
-  (fp_text user %R (at 0 -1.45) (layer F.Fab)
-    (effects (font (size 0.127 0.127) (thickness 0.03175)))
-  )
-  (fp_line (start 0.35 2.5) (end -0.35 2.5) (layer F.SilkS) (width 0.127))
-  (fp_line (start -0.35 0.4) (end 0.35 0.4) (layer F.SilkS) (width 0.127))
-  (fp_line (start -0.8 1.05) (end 0.8 1.05) (layer F.Fab) (width 0.05))
-  (fp_line (start 0.8 1.05) (end 0.8 1.85) (layer F.Fab) (width 0.05))
-  (fp_line (start 0.8 1.85) (end -0.8 1.85) (layer F.Fab) (width 0.05))
-  (fp_line (start -0.8 1.85) (end -0.8 1.05) (layer F.Fab) (width 0.05))
-  (fp_text user %R (at 0 1.45) (layer F.Fab)
-    (effects (font (size 0.127 0.127) (thickness 0.03175)))
-  )
-  (pad 1 smd rect (at 0 -1.45) (size 3.4 1.8) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 0 1.45) (size 3.4 1.8) (layers F.Cu F.Paste F.Mask))
-  (model ${KISYS3DMOD}/TestPoint.3dshapes/TestPoint_Bridge_Pitch7.62mm_Drill1.3mm.wrl
-    (offset (xyz -0.6834 -1 0))
-    (scale (xyz 0.18 0.62 0.09))
-    (rotate (xyz 0 0 0))
-  )
-  (model ${KISYS3DMOD}/TestPoint.3dshapes/TestPoint_Bridge_Pitch7.62mm_Drill1.3mm.wrl
-    (offset (xyz -0.6834 1 0))
-    (scale (xyz 0.18 0.62 0.09))
-    (rotate (xyz 0 0 0))
-  )
-)
diff --git a/PowerTestPoint_NoPaste.kicad_mod b/PowerTestPoint_NoPaste.kicad_mod
index baeb818..15df977 100644
--- a/PowerTestPoint_NoPaste.kicad_mod
+++ b/PowerTestPoint_NoPaste.kicad_mod
@@ -1,5 +1,5 @@
-(module PowerTestPoint_NoPaste (layer F.Cu) (tedit 5C68B193)
-  (attr smd)
+(module PowerTestPoint_NoPaste (layer F.Cu) (tedit 5CFD764E)
+  (attr virtual)
   (fp_text reference REF** (at 0 3.1) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
diff --git a/PowerTestPoint_Paste.kicad_mod b/PowerTestPoint_Paste.kicad_mod
index 2790545..e71db00 100644
--- a/PowerTestPoint_Paste.kicad_mod
+++ b/PowerTestPoint_Paste.kicad_mod
@@ -1,5 +1,5 @@
-(module PowerTestPoint_Paste (layer F.Cu) (tedit 5C68B19A)
-  (attr smd)
+(module PowerTestPoint_Paste (layer F.Cu) (tedit 5CFD764A)
+  (attr virtual)
   (fp_text reference REF** (at 0 3.1) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
diff --git a/R_0402.kicad_mod b/R_0402.kicad_mod
index 5a6a9bb..5176c6e 100644
--- a/R_0402.kicad_mod
+++ b/R_0402.kicad_mod
@@ -1,4 +1,4 @@
-(module R_0402 (layer F.Cu) (tedit 5BED851F)
+(module R_0402 (layer F.Cu) (tedit 5CF70C6D)
   (tags capacitor)
   (attr smd)
   (fp_text reference REF** (at 0 -0.85) (layer F.SilkS)
@@ -18,8 +18,8 @@
   (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.05))
   (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.05))
   (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.05))
-  (pad 2 smd roundrect (at 0.45 0) (size 0.6 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -0.45 0) (size 0.6 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 2 smd roundrect (at 0.5 0) (size 0.6 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 1 smd roundrect (at -0.5 0) (size 0.6 0.65) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
   (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
     (at (xyz 0 0 0))
     (scale (xyz 1 1 1))
diff --git a/RibbonCable_10.kicad_mod b/RibbonCable_10.kicad_mod
index f2b69ab..fe84966 100644
--- a/RibbonCable_10.kicad_mod
+++ b/RibbonCable_10.kicad_mod
@@ -1,4 +1,5 @@
-(module RibbonCable_10 (layer F.Cu) (tedit 5C91D448)
+(module RibbonCable_10 (layer F.Cu) (tedit 5CFD7644)
+  (attr virtual)
   (fp_text reference REF** (at 0 -4.445) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/Memory_SIMM_30.kicad_mod b/SIMM-30_Edge.kicad_mod
similarity index 98%
rename from Memory_SIMM_30.kicad_mod
rename to SIMM-30_Edge.kicad_mod
index 4065fd2..7ccad8e 100644
--- a/Memory_SIMM_30.kicad_mod
+++ b/SIMM-30_Edge.kicad_mod
@@ -1,8 +1,9 @@
-(module Memory_SIMM_30 (layer F.Cu) (tedit 5C2DD7B4)
+(module SIMM-30_Edge (layer F.Cu) (tedit 5CFD75E7)
+  (attr virtual)
   (fp_text reference REF** (at 35.56 -2.54) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value Memory_SIMM_30 (at 0 -2.54) (layer F.Fab)
+  (fp_text value SIMM-30_Edge (at 0 -2.54) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -38.862 1.778) (end -38.862 -1.778) (layer B.Fab) (width 0.127))
diff --git a/SOJ-32-400mil.kicad_mod b/SOJ-32-400mil.kicad_mod
deleted file mode 100644
index 87dc1a0..0000000
--- a/SOJ-32-400mil.kicad_mod
+++ /dev/null
@@ -1,65 +0,0 @@
-(module SOJ-32-400mil (layer F.Cu) (tedit 5C2ECC66)
-  (attr smd)
-  (fp_text reference REF** (at 0 -11.3538) (layer F.SilkS)
-    (effects (font (size 0.508 0.508) (thickness 0.127)))
-  )
-  (fp_text value SOJ-32-400mil (at 0 11.3792) (layer F.Fab)
-    (effects (font (size 0.508 0.508) (thickness 0.127)))
-  )
-  (fp_text user %R (at 0 0 90) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.15)))
-  )
-  (fp_line (start -4.02 -10.62) (end 5.02 -10.62) (layer F.Fab) (width 0.15))
-  (fp_line (start 5.02 -10.62) (end 5.02 10.62) (layer F.Fab) (width 0.15))
-  (fp_line (start 5.02 10.62) (end -5.02 10.62) (layer F.Fab) (width 0.15))
-  (fp_line (start -5.02 10.62) (end -5.02 -9.62) (layer F.Fab) (width 0.15))
-  (fp_line (start -5.02 -9.62) (end -4.02 -10.62) (layer F.Fab) (width 0.15))
-  (fp_line (start -7.22 -10.97) (end -7.22 10.97) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 7.22 -10.97) (end 7.22 10.97) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -7.22 -10.97) (end 7.22 -10.97) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -7.22 10.97) (end 7.22 10.97) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -5.145 -10.795) (end -5.145 -10.145) (layer F.SilkS) (width 0.15))
-  (fp_line (start 5.145 -10.795) (end 5.145 -10.05) (layer F.SilkS) (width 0.15))
-  (fp_line (start 5.145 10.795) (end 5.145 10.05) (layer F.SilkS) (width 0.15))
-  (fp_line (start -5.145 10.795) (end -5.145 10.05) (layer F.SilkS) (width 0.15))
-  (fp_line (start -5.145 -10.795) (end 5.145 -10.795) (layer F.SilkS) (width 0.15))
-  (fp_line (start -5.145 10.795) (end 5.145 10.795) (layer F.SilkS) (width 0.15))
-  (fp_line (start -5.145 -10.145) (end -6.97 -10.145) (layer F.SilkS) (width 0.15))
-  (pad 8 smd roundrect (at -4.97 -0.635) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 19 smd roundrect (at 4.97 6.985) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 6 smd roundrect (at -4.97 -3.175) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 21 smd roundrect (at 4.97 4.445) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 1 smd roundrect (at -4.97 -9.525) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 2 smd roundrect (at -4.97 -8.255) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 3 smd roundrect (at -4.97 -6.985) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 4 smd roundrect (at -4.97 -5.715) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 5 smd roundrect (at -4.97 -4.445) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 9 smd roundrect (at -4.97 0.635) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 10 smd roundrect (at -4.97 1.905) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 11 smd roundrect (at -4.97 3.175) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 12 smd roundrect (at -4.97 4.445) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 13 smd roundrect (at -4.97 5.715) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 15 smd roundrect (at -4.97 8.255) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 16 smd roundrect (at -4.97 9.525) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 17 smd roundrect (at 4.97 9.525) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 18 smd roundrect (at 4.97 8.255) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 22 smd roundrect (at 4.97 3.175) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 23 smd roundrect (at 4.97 1.905) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 24 smd roundrect (at 4.97 0.635) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 25 smd roundrect (at 4.97 -0.635) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 26 smd roundrect (at 4.97 -1.905) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 14 smd roundrect (at -4.97 6.985) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 7 smd roundrect (at -4.97 -1.905) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 20 smd roundrect (at 4.97 5.715) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 27 smd roundrect (at 4.97 -3.175) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 28 smd roundrect (at 4.97 -4.445) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 29 smd roundrect (at 4.97 -5.715) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 30 smd roundrect (at 4.97 -6.985) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 31 smd roundrect (at 4.97 -8.255) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (pad 32 smd roundrect (at 4.97 -9.525) (size 4 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
-  (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-28W_7.5x17.9mm_P1.27mm.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1.333333333 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
diff --git a/Semtech_QFN-16-1EP_3x3mm_P0.5mm.kicad_mod b/Semtech_QFN-16-1EP_3x3mm_P0.5mm.kicad_mod
index 40ec130..915e95f 100644
--- a/Semtech_QFN-16-1EP_3x3mm_P0.5mm.kicad_mod
+++ b/Semtech_QFN-16-1EP_3x3mm_P0.5mm.kicad_mod
@@ -1,66 +1,66 @@
-(module Semtech_QFN-16-1EP_3x3mm_P0.5mm (layer F.Cu) (tedit 5C706786)
+(module Semtech_QFN-16-1EP_3x3mm_P0.5mm (layer F.Cu) (tedit 5CF81D9B)
   (tags QFN-16)
   (attr smd)
-  (fp_text reference U102 (at 0 -2.55) (layer F.SilkS)
+  (fp_text reference REF** (at 0 -2.55) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
-  (fp_text value TS30011-M050QFN (at 0 2.6) (layer F.Fab)
+  (fp_text value Semtech_QFN-16-1EP_3x3mm_P0.5mm (at 0 2.6) (layer F.Fab)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
-  (fp_line (start 1.625 -1.625) (end 1.125 -1.625) (layer F.SilkS) (width 0.15))
-  (fp_line (start 1.625 1.625) (end 1.125 1.625) (layer F.SilkS) (width 0.15))
-  (fp_line (start -1.625 1.625) (end -1.125 1.625) (layer F.SilkS) (width 0.15))
-  (fp_line (start -1.625 -1.625) (end -1.125 -1.625) (layer F.SilkS) (width 0.15))
-  (fp_line (start 1.625 1.625) (end 1.625 1.125) (layer F.SilkS) (width 0.15))
-  (fp_line (start -1.625 1.625) (end -1.625 1.125) (layer F.SilkS) (width 0.15))
-  (fp_line (start 1.625 -1.625) (end 1.625 -1.125) (layer F.SilkS) (width 0.15))
-  (fp_line (start -2.2 2.2) (end 2.2 2.2) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.2 -2.2) (end 2.2 -2.2) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 2.2 -2.2) (end 2.2 2.2) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -2.2 -2.2) (end -2.2 2.2) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.5 -0.5) (end -0.5 -1.5) (layer F.Fab) (width 0.15))
-  (fp_line (start -1.5 1.5) (end -1.5 -0.5) (layer F.Fab) (width 0.15))
-  (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer F.Fab) (width 0.15))
-  (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
-  (fp_line (start -0.5 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
+  (fp_poly (pts (xy 0.7 0.2) (xy 0.45 0.2) (xy 0.25 0) (xy 0.45 -0.2)
+    (xy 0.7 -0.2)) (layer F.Paste) (width 0.15))
+  (fp_poly (pts (xy -0.7 -0.2) (xy -0.45 -0.2) (xy -0.25 0) (xy -0.45 0.2)
+    (xy -0.7 0.2)) (layer F.Paste) (width 0.15))
+  (fp_poly (pts (xy 0.2 -0.7) (xy 0.2 -0.45) (xy 0 -0.25) (xy -0.2 -0.45)
+    (xy -0.2 -0.7)) (layer F.Paste) (width 0.15))
+  (fp_poly (pts (xy -0.2 0.7) (xy -0.2 0.45) (xy 0 0.25) (xy 0.2 0.45)
+    (xy 0.2 0.7)) (layer F.Paste) (width 0.15))
   (fp_text user %R (at 0 0) (layer F.Fab)
     (effects (font (size 0.254 0.254) (thickness 0.0635)))
   )
-  (fp_poly (pts (xy -0.2 0.7) (xy -0.2 0.45) (xy 0 0.25) (xy 0.2 0.45)
-    (xy 0.2 0.7)) (layer F.Paste) (width 0.15))
-  (fp_poly (pts (xy 0.2 -0.7) (xy 0.2 -0.45) (xy 0 -0.25) (xy -0.2 -0.45)
-    (xy -0.2 -0.7)) (layer F.Paste) (width 0.15))
-  (fp_poly (pts (xy -0.7 -0.2) (xy -0.45 -0.2) (xy -0.25 0) (xy -0.45 0.2)
-    (xy -0.7 0.2)) (layer F.Paste) (width 0.15))
-  (fp_poly (pts (xy 0.7 0.2) (xy 0.45 0.2) (xy 0.25 0) (xy 0.45 -0.2)
-    (xy 0.7 -0.2)) (layer F.Paste) (width 0.15))
-  (pad 17 smd rect (at 0 0) (size 1.7 1.7) (layers B.Cu B.Mask)
+  (fp_line (start -0.95 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
+  (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
+  (fp_line (start 1.5 1.5) (end -1.5 1.5) (layer F.Fab) (width 0.15))
+  (fp_line (start -1.5 1.5) (end -1.5 -0.95) (layer F.Fab) (width 0.15))
+  (fp_line (start -1.5 -0.95) (end -0.95 -1.5) (layer F.Fab) (width 0.15))
+  (fp_line (start -2.2 -2.2) (end -2.2 2.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 2.2 -2.2) (end 2.2 2.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.2 -2.2) (end 2.2 -2.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.2 2.2) (end 2.2 2.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.625 -1.625) (end 1.625 -1.125) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.625 1.625) (end -1.625 1.125) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.625 1.625) (end 1.625 1.125) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.625 -1.625) (end -1.125 -1.625) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.625 1.625) (end -1.125 1.625) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.625 1.625) (end 1.125 1.625) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.625 -1.625) (end 1.125 -1.625) (layer F.SilkS) (width 0.15))
+  (pad 1 smd roundrect (at -1.55 -0.75) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 17 thru_hole circle (at -0.55 -0.55 90) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
     (zone_connect 2))
-  (pad 17 thru_hole circle (at -0.55 0.55 90) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
+  (pad 2 smd roundrect (at -1.55 -0.25) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 3 smd roundrect (at -1.55 0.25) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 4 smd roundrect (at -1.55 0.75) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 5 smd roundrect (at -0.75 1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 6 smd roundrect (at -0.25 1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 7 smd roundrect (at 0.25 1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 8 smd roundrect (at 0.75 1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 9 smd roundrect (at 1.55 0.75) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 10 smd roundrect (at 1.55 0.25) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 11 smd roundrect (at 1.55 -0.25) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 12 smd roundrect (at 1.55 -0.75) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 13 smd roundrect (at 0.75 -1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 14 smd roundrect (at 0.25 -1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 15 smd roundrect (at -0.25 -1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 16 smd roundrect (at -0.75 -1.55 90) (size 0.75 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25))
+  (pad 17 smd rect (at 0 0) (size 1.7 1.7) (layers F.Cu F.Mask)
+    (zone_connect 0))
+  (pad 17 thru_hole circle (at 0.55 -0.55 90) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
     (zone_connect 2))
   (pad 17 thru_hole circle (at 0.55 0.55 90) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
     (zone_connect 2))
-  (pad 17 thru_hole circle (at 0.55 -0.55 90) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
+  (pad 17 thru_hole circle (at -0.55 0.55 90) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
     (zone_connect 2))
-  (pad 17 smd rect (at 0 0) (size 1.7 1.7) (layers F.Cu F.Mask)
-    (zone_connect 0))
-  (pad 16 smd oval (at -0.75 -1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 15 smd oval (at -0.25 -1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 14 smd oval (at 0.25 -1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 13 smd oval (at 0.75 -1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 12 smd oval (at 1.5 -0.75) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 11 smd oval (at 1.5 -0.25) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 10 smd oval (at 1.5 0.25) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 9 smd oval (at 1.5 0.75) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 8 smd oval (at 0.75 1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 7 smd oval (at 0.25 1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 6 smd oval (at -0.25 1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 5 smd oval (at -0.75 1.5 90) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 4 smd oval (at -1.5 0.75) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 3 smd oval (at -1.5 0.25) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd oval (at -1.5 -0.25) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd oval (at -1.5 -0.75) (size 0.8 0.3) (layers F.Cu F.Paste F.Mask))
-  (pad 17 thru_hole circle (at -0.55 -0.55 90) (size 0.51 0.51) (drill 0.2) (layers *.Cu B.Mask)
+  (pad 17 smd rect (at 0 0) (size 1.7 1.7) (layers B.Cu B.Mask)
     (zone_connect 2))
   (model ${KISYS3DMOD}/Package_DFN_QFN.3dshapes/QFN-16-1EP_3x3mm_P0.5mm_EP1.8x1.8mm.wrl
     (at (xyz 0 0 0))
diff --git a/SolderJumper-2.kicad_mod b/SolderJumper-2_NoPaste.kicad_mod
similarity index 90%
rename from SolderJumper-2.kicad_mod
rename to SolderJumper-2_NoPaste.kicad_mod
index 32d0c14..05e0e65 100644
--- a/SolderJumper-2.kicad_mod
+++ b/SolderJumper-2_NoPaste.kicad_mod
@@ -1,11 +1,11 @@
-(module SolderJumper-2 (layer F.Cu) (tedit 5C64B742)
+(module SolderJumper-2_NoPaste (layer F.Cu) (tedit 5CFD7598)
   (descr "SMD Solder Jumper, 1x1.5mm, rounded Pads, 0.3mm gap, open")
   (tags "solder jumper open")
   (attr virtual)
   (fp_text reference REF** (at 0 -1.6) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
-  (fp_text value SolderJumper-2 (at 0 1.65) (layer F.Fab)
+  (fp_text value SolderJumper-2_NoPaste (at 0 1.65) (layer F.Fab)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
   (fp_arc (start 0.7 -0.3) (end 1.4 -0.3) (angle -90) (layer F.SilkS) (width 0.12))
@@ -21,7 +21,7 @@
   (fp_line (start 1.65 1.25) (end 1.65 -1.25) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.65 1.25) (end -1.65 1.25) (layer F.CrtYd) (width 0.05))
   (pad 1 smd custom (at -0.65 0) (size 1 0.5) (layers F.Cu F.Mask)
-    (zone_connect 0)
+    (clearance 0.254) (zone_connect 0)
     (options (clearance outline) (anchor rect))
     (primitives
       (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0))
@@ -30,7 +30,7 @@
          (xy 0 -0.75) (xy 0.5 -0.75) (xy 0.5 0.75) (xy 0 0.75)) (width 0))
     ))
   (pad 2 smd custom (at 0.65 0) (size 1 0.5) (layers F.Cu F.Mask)
-    (zone_connect 0)
+    (clearance 0.254) (zone_connect 0)
     (options (clearance outline) (anchor rect))
     (primitives
       (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0))
diff --git a/SolderJumper-2_Paste.kicad_mod b/SolderJumper-2_Paste.kicad_mod
new file mode 100644
index 0000000..17c99d4
--- /dev/null
+++ b/SolderJumper-2_Paste.kicad_mod
@@ -0,0 +1,41 @@
+(module SolderJumper-2_Paste (layer F.Cu) (tedit 5CF82452)
+  (descr "SMD Solder Jumper, 1x1.5mm, rounded Pads, 0.3mm gap, open")
+  (tags "solder jumper open")
+  (attr virtual)
+  (fp_text reference REF** (at 0 -1.6) (layer F.SilkS)
+    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  )
+  (fp_text value SolderJumper-2_Paste (at 0 1.65) (layer F.Fab)
+    (effects (font (size 0.508 0.508) (thickness 0.127)))
+  )
+  (fp_arc (start 0.7 -0.3) (end 1.4 -0.3) (angle -90) (layer F.SilkS) (width 0.12))
+  (fp_arc (start 0.7 0.3) (end 0.7 1) (angle -90) (layer F.SilkS) (width 0.12))
+  (fp_arc (start -0.7 0.3) (end -1.4 0.3) (angle -90) (layer F.SilkS) (width 0.12))
+  (fp_arc (start -0.7 -0.3) (end -0.7 -1) (angle -90) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.4 0.3) (end -1.4 -0.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.7 1) (end -0.7 1) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.4 -0.3) (end 1.4 0.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.7 -1) (end 0.7 -1) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.65 -1.25) (end 1.65 -1.25) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.65 -1.25) (end -1.65 1.25) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.65 1.25) (end 1.65 -1.25) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.65 1.25) (end -1.65 1.25) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd custom (at -0.65 0) (size 1 0.5) (layers F.Cu F.Paste F.Mask)
+    (solder_paste_margin -0.1) (clearance 0.254) (zone_connect 0)
+    (options (clearance outline) (anchor rect))
+    (primitives
+      (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0))
+      (gr_circle (center 0 -0.25) (end 0.5 -0.25) (width 0))
+      (gr_poly (pts
+         (xy 0 -0.75) (xy 0.5 -0.75) (xy 0.5 0.75) (xy 0 0.75)) (width 0))
+    ))
+  (pad 2 smd custom (at 0.65 0) (size 1 0.5) (layers F.Cu F.Paste F.Mask)
+    (solder_paste_margin -0.1) (clearance 0.254) (zone_connect 0)
+    (options (clearance outline) (anchor rect))
+    (primitives
+      (gr_circle (center 0 0.25) (end 0.5 0.25) (width 0))
+      (gr_circle (center 0 -0.25) (end 0.5 -0.25) (width 0))
+      (gr_poly (pts
+         (xy 0 -0.75) (xy -0.5 -0.75) (xy -0.5 0.75) (xy 0 0.75)) (width 0))
+    ))
+)