diff --git a/ArduinoProMicro-Mini-USB-ZigZag.kicad_mod b/ArduinoProMicro-Mini-USB-ZigZag.kicad_mod
new file mode 100644
index 0000000..7e3325e
--- /dev/null
+++ b/ArduinoProMicro-Mini-USB-ZigZag.kicad_mod
@@ -0,0 +1,204 @@
+(module ArduinoProMicro-Mini-USB-ZigZag (layer F.Cu) (tedit 5CEEEAD7)
+  (fp_text reference U1 (at 0 1.125) (layer F.SilkS) hide
+    (effects (font (size 1.27 1.524) (thickness 0.2032)))
+  )
+  (fp_text value ProMicro (at 0 -1) (layer F.SilkS) hide
+    (effects (font (size 1.27 1.524) (thickness 0.2032)))
+  )
+  (fp_line (start -12.7 8.85) (end -12.7 11.39) (layer B.SilkS) (width 0.381))
+  (fp_line (start -15.24 8.85) (end -12.7 8.85) (layer B.SilkS) (width 0.381))
+  (fp_text user D2 (at -11.43 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user D0 (at -1.27 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user D1 (at -3.81 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user GND (at -6.35 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user GND (at -8.89 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user D4 (at 1.27 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user C6 (at 3.81 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user D7 (at 6.35 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user E6 (at 8.89 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user B4 (at 11.43 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user B5 (at 13.97 7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user B6 (at 13.97 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user B2 (at 11.43 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user B3 (at 8.89 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user B1 (at 6.35 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user F7 (at 3.81 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user F6 (at 1.27 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user F5 (at -1.27 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user F4 (at -3.81 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user VCC (at -6.35 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user GND (at -11.43 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user RAW (at -13.97 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user RAW (at -13.97 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user GND (at -11.43 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user ST (at -8.92 -8.23312 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user VCC (at -6.35 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user F4 (at -3.81 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user F5 (at -1.27 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user F6 (at 1.27 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user F7 (at 3.81 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user B1 (at 6.35 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user B3 (at 8.89 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user B2 (at 11.43 -7.961 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user B6 (at 13.97 -7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user B5 (at 13.97 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user B4 (at 11.43 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user E6 (at 8.89 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user D7 (at 6.35 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user C6 (at 3.81 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user D4 (at 1.27 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user GND (at -8.89 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user GND (at -6.35 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user D1 (at -3.81 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user D0 (at -1.27 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user D2 (at -11.43 7.961 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text user TX0/D3 (at -13.97 6.071872 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_text user TX0/D3 (at -13.97 6.071872 90) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_line (start -24.04 -11.39) (end -24.04 11.39) (layer F.SilkS) (width 0.381))
+  (fp_line (start -24.04 11.39) (end 15.24 11.39) (layer F.SilkS) (width 0.381))
+  (fp_line (start 15.24 11.39) (end 15.24 -11.39) (layer F.SilkS) (width 0.381))
+  (fp_line (start 15.24 -11.39) (end -24.04 -11.39) (layer F.SilkS) (width 0.381))
+  (fp_line (start -15.24 8.85) (end -12.7 8.85) (layer F.SilkS) (width 0.381))
+  (fp_line (start -12.7 8.85) (end -12.7 11.39) (layer F.SilkS) (width 0.381))
+  (fp_poly (pts (xy -9.36064 -7.431568) (xy -9.06064 -7.431568) (xy -9.06064 -7.331568) (xy -9.36064 -7.331568)) (layer F.SilkS) (width 0.15))
+  (fp_poly (pts (xy -8.96064 -7.231568) (xy -8.86064 -7.231568) (xy -8.86064 -7.131568) (xy -8.96064 -7.131568)) (layer F.SilkS) (width 0.15))
+  (fp_poly (pts (xy -9.36064 -7.431568) (xy -9.26064 -7.431568) (xy -9.26064 -6.931568) (xy -9.36064 -6.931568)) (layer F.SilkS) (width 0.15))
+  (fp_poly (pts (xy -9.36064 -7.031568) (xy -8.56064 -7.031568) (xy -8.56064 -6.931568) (xy -9.36064 -6.931568)) (layer F.SilkS) (width 0.15))
+  (fp_poly (pts (xy -8.76064 -7.431568) (xy -8.56064 -7.431568) (xy -8.56064 -7.331568) (xy -8.76064 -7.331568)) (layer F.SilkS) (width 0.15))
+  (fp_text user ST (at -8.91 -7.54 90) (layer B.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
+  )
+  (fp_poly (pts (xy -8.95097 -8.544635) (xy -8.85097 -8.544635) (xy -8.85097 -8.644635) (xy -8.95097 -8.644635)) (layer B.SilkS) (width 0.15))
+  (fp_poly (pts (xy -9.35097 -8.744635) (xy -8.55097 -8.744635) (xy -8.55097 -8.844635) (xy -9.35097 -8.844635)) (layer B.SilkS) (width 0.15))
+  (fp_poly (pts (xy -8.75097 -8.344635) (xy -8.55097 -8.344635) (xy -8.55097 -8.444635) (xy -8.75097 -8.444635)) (layer B.SilkS) (width 0.15))
+  (fp_poly (pts (xy -9.35097 -8.344635) (xy -9.05097 -8.344635) (xy -9.05097 -8.444635) (xy -9.35097 -8.444635)) (layer B.SilkS) (width 0.15))
+  (fp_poly (pts (xy -9.35097 -8.344635) (xy -9.25097 -8.344635) (xy -9.25097 -8.844635) (xy -9.35097 -8.844635)) (layer B.SilkS) (width 0.15))
+  (fp_line (start 15.24 -11.39) (end -24.04 -11.39) (layer B.SilkS) (width 0.381))
+  (fp_line (start 15.24 11.39) (end 15.24 -11.39) (layer B.SilkS) (width 0.381))
+  (fp_line (start -24.04 11.39) (end 15.24 11.39) (layer B.SilkS) (width 0.381))
+  (fp_line (start -24.04 -11.39) (end -24.04 11.39) (layer B.SilkS) (width 0.381))
+  (fp_line (start -15.24 8.85) (end -15.24 11.39) (layer F.SilkS) (width 0.381))
+  (fp_line (start -15.24 8.85) (end -15.24 11.39) (layer B.SilkS) (width 0.381))
+  (fp_line (start -16 4) (end -16 -4) (layer F.SilkS) (width 0.2))
+  (fp_line (start -16 -4) (end -25.5 -4) (layer F.SilkS) (width 0.2))
+  (fp_line (start -25.5 -4) (end -25.5 4) (layer F.SilkS) (width 0.2))
+  (fp_line (start -25.5 4) (end -16 4) (layer F.SilkS) (width 0.2))
+  (pad 1 thru_hole rect (at -13.97 10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 2 thru_hole circle (at -11.43 9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 3 thru_hole circle (at -8.89 10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 4 thru_hole circle (at -6.35 9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 5 thru_hole circle (at -3.81 10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 6 thru_hole circle (at -1.27 9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 7 thru_hole circle (at 1.27 10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 8 thru_hole circle (at 3.81 9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 9 thru_hole circle (at 6.35 10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 10 thru_hole circle (at 8.89 9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 11 thru_hole circle (at 11.43 10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 13 thru_hole circle (at 13.97 -9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 14 thru_hole circle (at 11.43 -10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 15 thru_hole circle (at 8.89 -9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 16 thru_hole circle (at 6.35 -10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 17 thru_hole circle (at 3.81 -9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 18 thru_hole circle (at 1.27 -10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 19 thru_hole circle (at -1.27 -9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 20 thru_hole circle (at -3.81 -10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 21 thru_hole circle (at -6.35 -9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 22 thru_hole circle (at -8.89 -10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 23 thru_hole circle (at -11.43 -9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 12 thru_hole circle (at 13.97 9.8914) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+  (pad 24 thru_hole circle (at -13.97 -10.3486) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask))
+)
diff --git a/C_0603.kicad_mod b/C_0603.kicad_mod
new file mode 100644
index 0000000..2b672e5
--- /dev/null
+++ b/C_0603.kicad_mod
@@ -0,0 +1,24 @@
+(module C_0603 (layer F.Cu) (tedit 5CED8C0C)
+  (descr "SMT, 1608, 0603")
+  (tags "SMT, 1608, 0603")
+  (attr smd)
+  (fp_text reference C_0603 (at -2.05 0 90) (layer F.SilkS)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_text value R*** (at 0 -1.25) (layer F.SilkS)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_line (start -1.35 -0.55) (end 1.35 -0.55) (layer F.SilkS) (width 0.2))
+  (fp_line (start 1.35 -0.55) (end 1.35 0.55) (layer F.SilkS) (width 0.2))
+  (fp_line (start 1.35 0.55) (end -1.35 0.55) (layer F.SilkS) (width 0.2))
+  (fp_line (start -1.35 0.55) (end -1.35 -0.55) (layer F.SilkS) (width 0.2))
+  (pad 2 smd rect (at 0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.1))
+  (pad 1 smd rect (at -0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.1))
+  (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/D_SOD123.kicad_mod b/D_SOD123.kicad_mod
new file mode 100644
index 0000000..2ccc8db
--- /dev/null
+++ b/D_SOD123.kicad_mod
@@ -0,0 +1,18 @@
+(module D_SOD123 (layer F.Cu) (tedit 561B69D3)
+  (attr smd)
+  (fp_text reference D_SOD123 (at 0 1.925) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_text value VAL** (at 0 -1.925) (layer F.SilkS) hide
+    (effects (font (size 0.8 0.8) (thickness 0.15)))
+  )
+  (fp_line (start -3.075 1.2) (end -3.075 -1.2) (layer F.SilkS) (width 0.2))
+  (fp_line (start -2.8 -1.2) (end -2.8 1.2) (layer F.SilkS) (width 0.2))
+  (fp_line (start -2.925 -1.2) (end -2.925 1.2) (layer F.SilkS) (width 0.2))
+  (fp_line (start -3.2 -1.2) (end 2.8 -1.2) (layer F.SilkS) (width 0.2))
+  (fp_line (start 2.8 -1.2) (end 2.8 1.2) (layer F.SilkS) (width 0.2))
+  (fp_line (start 2.8 1.2) (end -3.2 1.2) (layer F.SilkS) (width 0.2))
+  (fp_line (start -3.2 1.2) (end -3.2 -1.2) (layer F.SilkS) (width 0.2))
+  (pad 2 smd rect (at 1.7 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -1.7 0) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/D_SOD123F.kicad_mod b/D_SOD123F.kicad_mod
new file mode 100644
index 0000000..ce285a3
--- /dev/null
+++ b/D_SOD123F.kicad_mod
@@ -0,0 +1,29 @@
+(module D_SOD123F (layer F.Cu) (tedit 5CED8905)
+  (attr smd)
+  (fp_text reference D_SOD123 (at 0 1.4) (layer F.SilkS)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_text value VAL** (at 0 -1.925) (layer F.SilkS) hide
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_line (start -2.7 -0.7) (end 2.1 -0.7) (layer F.SilkS) (width 0.2))
+  (fp_line (start 2.1 -0.7) (end 2.1 0.7) (layer F.SilkS) (width 0.2))
+  (fp_line (start -2.7 0.7) (end 2.1 0.7) (layer F.SilkS) (width 0.2))
+  (fp_line (start -2.1 -0.7) (end -2.1 0.7) (layer F.SilkS) (width 0.2))
+  (fp_line (start -2.3 -0.7) (end -2.3 0.7) (layer F.SilkS) (width 0.2))
+  (fp_line (start -2.5 -0.7) (end -2.5 0.7) (layer F.SilkS) (width 0.2))
+  (fp_line (start -2.7 -0.7) (end -2.7 0.7) (layer F.SilkS) (width 0.2))
+  (fp_line (start -0.3 0) (end 0.3 -0.35) (layer F.SilkS) (width 0.2))
+  (fp_line (start 0.3 -0.35) (end 0.3 0.4) (layer F.SilkS) (width 0.2))
+  (fp_line (start 0.3 0.4) (end -0.3 0) (layer F.SilkS) (width 0.2))
+  (fp_line (start -0.3 -0.35) (end -0.3 0.4) (layer F.SilkS) (width 0.2))
+  (fp_line (start -0.3 0) (end -0.6 0) (layer F.SilkS) (width 0.2))
+  (fp_line (start 0.3 0) (end 0.6 0) (layer F.SilkS) (width 0.2))
+  (pad 2 smd rect (at 1.4 0) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -1.4 0) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-123F.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/HRO-TYPE-C-31-M-12-Assembly.kicad_mod b/HRO-TYPE-C-31-M-12-Assembly.kicad_mod
index 602d461..57408b2 100644
--- a/HRO-TYPE-C-31-M-12-Assembly.kicad_mod
+++ b/HRO-TYPE-C-31-M-12-Assembly.kicad_mod
@@ -1,7 +1,8 @@
-(module HRO-TYPE-C-31-M-12-Assembly (layer F.Cu) (tedit 5C72191E)
+(module HRO-TYPE-C-31-M-12-Assembly (layer F.Cu) (tedit 5CD109E1)
   (solder_mask_margin 0.05)
   (solder_paste_margin 0.05)
   (clearance 0.05)
+  (attr smd)
   (fp_text reference REF** (at 0 -9.25) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
@@ -15,13 +16,14 @@
   (fp_text user %R (at 0 -9.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -4.5 -7.5) (end 4.5 -7.5) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -4.5 -7.5) (end -3.75 -7.5) (layer F.CrtYd) (width 0.15))
   (fp_line (start 4.5 -7.5) (end 4.5 0) (layer F.CrtYd) (width 0.15))
   (fp_line (start 4.5 0) (end -4.5 0) (layer F.CrtYd) (width 0.15))
   (fp_line (start -4.5 0) (end -4.5 -7.5) (layer F.CrtYd) (width 0.15))
   (fp_line (start -3.75 -7.5) (end -3.75 -8.5) (layer F.CrtYd) (width 0.15))
   (fp_line (start -3.75 -8.5) (end 3.75 -8.5) (layer F.CrtYd) (width 0.15))
   (fp_line (start 3.75 -8.5) (end 3.75 -7.5) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 4.5 -7.5) (end 3.75 -7.5) (layer F.CrtYd) (width 0.15))
   (pad 13 thru_hole oval (at 4.32 -2.6) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask))
   (pad 13 thru_hole oval (at -4.32 -2.6) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask))
   (pad 13 thru_hole oval (at 4.32 -6.78) (size 1 2.1) (drill oval 0.6 1.7) (layers *.Cu *.Mask))
diff --git a/MX-Alps-Choc-1U-No-Clickhole.kicad_mod b/MX-Alps-Choc-1U-No-Clickhole.kicad_mod
new file mode 100644
index 0000000..d84a6f2
--- /dev/null
+++ b/MX-Alps-Choc-1U-No-Clickhole.kicad_mod
@@ -0,0 +1,45 @@
+(module MX-Alps-Choc-1U-No-Clickhole (layer F.Cu) (tedit 5CE30CB9)
+  (fp_text reference REF** (at 0 3.175) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value 1U (at 0 -7.9375) (layer Dwgs.User)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+  (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+  (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+  (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+  (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+  (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+  (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+  (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+  (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+  (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+  (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+  (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+  (fp_text user + (at -1.27 3.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user + (at -1.27 3.5) (layer B.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user - (at 1.27 3.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user - (at 1.27 3.5) (layer B.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 2 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at -1.27 5.08) (size 1.905 1.905) (drill 0.9906) (layers *.Cu *.Mask))
+  (pad 4 thru_hole rect (at 1.27 5.08) (size 1.905 1.905) (drill 0.9906) (layers *.Cu *.Mask))
+)
diff --git a/MX-Alps-Choc-1U.kicad_mod b/MX-Alps-Choc-1U.kicad_mod
index ac97367..8c4665b 100644
--- a/MX-Alps-Choc-1U.kicad_mod
+++ b/MX-Alps-Choc-1U.kicad_mod
@@ -1,4 +1,4 @@
-(module MX-Alps-Choc-1U (layer F.Cu) (tedit 5C7EAB4F)
+(module MX-Alps-Choc-1U (layer F.Cu) (tedit 5CE00D88)
   (fp_text reference REF** (at 0 3.175) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
@@ -29,18 +29,18 @@
   (fp_text user - (at 1.27 3.5) (layer B.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
   (pad 3 thru_hole circle (at -1.27 5.08) (size 1.905 1.905) (drill 0.9906) (layers *.Cu *.Mask))
   (pad 4 thru_hole rect (at 1.27 5.08) (size 1.905 1.905) (drill 0.9906) (layers *.Cu *.Mask))
 )
diff --git a/MX-Alps-Choc-2U-StabFlip.kicad_mod b/MX-Alps-Choc-2U-StabFlip.kicad_mod
index a27b370..aa80b60 100644
--- a/MX-Alps-Choc-2U-StabFlip.kicad_mod
+++ b/MX-Alps-Choc-2U-StabFlip.kicad_mod
@@ -1,4 +1,4 @@
-(module MX-Alps-Choc-2U-StabFlip (layer F.Cu) (tedit 5C7EAB84)
+(module MX-Alps-Choc-2U-StabFlip (layer F.Cu) (tedit 5CE0052F)
   (fp_text reference REF** (at 0 3.175) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
@@ -29,15 +29,15 @@
   (fp_text user - (at 1.27 3.5) (layer B.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
diff --git a/MX-Alps-Choc-2U.kicad_mod b/MX-Alps-Choc-2U.kicad_mod
index 5dd8ba5..cfe3823 100644
--- a/MX-Alps-Choc-2U.kicad_mod
+++ b/MX-Alps-Choc-2U.kicad_mod
@@ -1,4 +1,4 @@
-(module MX-Alps-Choc-2U (layer F.Cu) (tedit 5C7EAD57)
+(module MX-Alps-Choc-2U (layer F.Cu) (tedit 5CE0050F)
   (fp_text reference REF** (at 0 3.175) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
@@ -29,15 +29,15 @@
   (fp_text user - (at 1.27 3.5) (layer B.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-  (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
diff --git a/R_0603.kicad_mod b/R_0603.kicad_mod
new file mode 100644
index 0000000..e790937
--- /dev/null
+++ b/R_0603.kicad_mod
@@ -0,0 +1,24 @@
+(module R_0603 (layer F.Cu) (tedit 5CED8C86)
+  (descr "SMT, 1608, 0603")
+  (tags "SMT, 1608, 0603")
+  (attr smd)
+  (fp_text reference R_0603 (at -1.9 0 90) (layer F.SilkS)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_text value R** (at 0 1.35) (layer F.SilkS)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_line (start -1.2 -0.65) (end 1.2 -0.65) (layer F.SilkS) (width 0.2))
+  (fp_line (start 1.2 -0.65) (end 1.2 0.65) (layer F.SilkS) (width 0.2))
+  (fp_line (start 1.2 0.65) (end -1.2 0.65) (layer F.SilkS) (width 0.2))
+  (fp_line (start -1.2 0.65) (end -1.2 -0.65) (layer F.SilkS) (width 0.2))
+  (pad 2 smd rect (at 0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.1))
+  (pad 1 smd rect (at -0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.1))
+  (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/R_0805.kicad_mod b/R_0805.kicad_mod
new file mode 100644
index 0000000..879d7d2
--- /dev/null
+++ b/R_0805.kicad_mod
@@ -0,0 +1,24 @@
+(module R_0805 (layer F.Cu) (tedit 5CED8C8D)
+  (descr "SMT, 2012, 0805")
+  (tags "SMT, 2012, 0805")
+  (attr smd)
+  (fp_text reference R_0805 (at -2.2 0 90) (layer F.SilkS)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_text value R** (at 0 1.55) (layer F.SilkS)
+    (effects (font (size 0.7 0.7) (thickness 0.15)))
+  )
+  (fp_line (start -1.5 -0.85) (end 1.5 -0.85) (layer F.SilkS) (width 0.2))
+  (fp_line (start 1.5 -0.85) (end 1.5 0.85) (layer F.SilkS) (width 0.2))
+  (fp_line (start -1.5 -0.85) (end -1.5 0.85) (layer F.SilkS) (width 0.2))
+  (fp_line (start -1.5 0.85) (end 1.5 0.85) (layer F.SilkS) (width 0.2))
+  (pad 2 smd rect (at 0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.1))
+  (pad 1 smd rect (at -0.95 0) (size 0.7 1.3) (layers F.Cu F.Paste F.Mask)
+    (clearance 0.1))
+  (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/RotaryEncoder_Alps_EC11E-Switch_Vertical_H20mm.kicad_mod b/RotaryEncoder_Alps_EC11E-Switch_Vertical_H20mm.kicad_mod
new file mode 100644
index 0000000..44dc202
--- /dev/null
+++ b/RotaryEncoder_Alps_EC11E-Switch_Vertical_H20mm.kicad_mod
@@ -0,0 +1,51 @@
+(module RotaryEncoder_Alps_EC11E-Switch_Vertical_H20mm (layer F.Cu) (tedit 5CA39399)
+  (descr "Alps rotary encoder, EC12E... with switch, vertical shaft, http://www.alps.com/prod/info/E/HTML/Encoder/Incremental/EC11/EC11E15204A3.html")
+  (tags "rotary encoder")
+  (fp_text reference SWR1 (at -4.7 -7.2) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Rotary_Encoder_Switch (at 0 7.9) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center 0 0) (end 3 0) (layer F.Fab) (width 0.12))
+  (fp_circle (center 0 0) (end 3 0) (layer F.SilkS) (width 0.12))
+  (fp_line (start 8.5 7.1) (end -9 7.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 8.5 7.1) (end 8.5 -7.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -9 -7.1) (end -9 7.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -9 -7.1) (end 8.5 -7.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5 -5.8) (end 6 -5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start 6 -5.8) (end 6 5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start 6 5.8) (end -6 5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start -6 5.8) (end -6 -4.7) (layer F.Fab) (width 0.12))
+  (fp_line (start -6 -4.7) (end -5 -5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start 2 -5.9) (end 6.1 -5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.1 5.9) (end 2 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2 5.9) (end -6.1 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2 -5.9) (end -6.1 -5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -6.1 -5.9) (end -6.1 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -7.5 -3.8) (end -7.8 -4.1) (layer F.SilkS) (width 0.12))
+  (fp_line (start -7.8 -4.1) (end -7.2 -4.1) (layer F.SilkS) (width 0.12))
+  (fp_line (start -7.2 -4.1) (end -7.5 -3.8) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0 -3) (end 0 3) (layer F.Fab) (width 0.12))
+  (fp_line (start -3 0) (end 3 0) (layer F.Fab) (width 0.12))
+  (fp_line (start 6.1 -5.9) (end 6.1 -3.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.1 -1.3) (end 6.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.1 3.5) (end 6.1 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0 -0.5) (end 0 0.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.5 0) (end 0.5 0) (layer F.SilkS) (width 0.12))
+  (fp_text user %R (at 3.6 3.8) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad A thru_hole rect (at -7.5 -2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad C thru_hole circle (at -7.5 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad B thru_hole circle (at -7.5 2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad MP thru_hole rect (at 0 -5.6) (size 3.2 2) (drill oval 2.8 1.5) (layers *.Cu *.Mask))
+  (pad MP thru_hole rect (at 0 5.6) (size 3.2 2) (drill oval 2.8 1.5) (layers *.Cu *.Mask))
+  (pad S2 thru_hole circle (at 7 -2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 7 2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Rotary_Encoder.3dshapes/RotaryEncoder_Alps_EC11E-Switch_Vertical_H20mm.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/RotaryEncoder_EC11.kicad_mod b/RotaryEncoder_EC11.kicad_mod
new file mode 100644
index 0000000..d22a5d9
--- /dev/null
+++ b/RotaryEncoder_EC11.kicad_mod
@@ -0,0 +1,51 @@
+(module RotaryEncoder_EC11 (layer F.Cu) (tedit 5CA3A452)
+  (descr "Alps rotary encoder, EC12E... with switch, vertical shaft, http://www.alps.com/prod/info/E/HTML/Encoder/Incremental/EC11/EC11E15204A3.html")
+  (tags "rotary encoder")
+  (fp_text reference REF** (at -4.7 -7.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value RotaryEncoder_EC11 (at 0 7.9) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 3.6 3.8) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.5 0) (end 0.5 0) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0 -0.5) (end 0 0.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.1 3.5) (end 6.1 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.1 -1.3) (end 6.1 1.3) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.1 -5.9) (end 6.1 -3.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 0) (end 3 0) (layer F.Fab) (width 0.12))
+  (fp_line (start 0 -3) (end 0 3) (layer F.Fab) (width 0.12))
+  (fp_line (start -7.2 -4.1) (end -7.5 -3.8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -7.8 -4.1) (end -7.2 -4.1) (layer F.SilkS) (width 0.12))
+  (fp_line (start -7.5 -3.8) (end -7.8 -4.1) (layer F.SilkS) (width 0.12))
+  (fp_line (start -6.1 -5.9) (end -6.1 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2 -5.9) (end -6.1 -5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2 5.9) (end -6.1 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.1 5.9) (end 2 5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start 2 -5.9) (end 6.1 -5.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -6 -4.7) (end -5 -5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start -6 5.8) (end -6 -4.7) (layer F.Fab) (width 0.12))
+  (fp_line (start 6 5.8) (end -6 5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start 6 -5.8) (end 6 5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start -5 -5.8) (end 6 -5.8) (layer F.Fab) (width 0.12))
+  (fp_line (start -9 -7.1) (end 8.5 -7.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -9 -7.1) (end -9 7.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 8.5 7.1) (end 8.5 -7.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 8.5 7.1) (end -9 7.1) (layer F.CrtYd) (width 0.05))
+  (fp_circle (center 0 0) (end 3 0) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 0 0) (end 3 0) (layer F.Fab) (width 0.12))
+  (pad S1 thru_hole circle (at 7 2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad S2 thru_hole circle (at 7 -2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad MP thru_hole rect (at 0 5.6) (size 3.2 2) (drill oval 2.8 1.5) (layers *.Cu *.Mask))
+  (pad MP thru_hole rect (at 0 -5.6) (size 3.2 2) (drill oval 2.8 1.5) (layers *.Cu *.Mask))
+  (pad B thru_hole circle (at -7.5 2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad C thru_hole circle (at -7.5 0) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (pad A thru_hole rect (at -7.5 -2.5) (size 2 2) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Rotary_Encoder.3dshapes/RotaryEncoder_Alps_EC11E-Switch_Vertical_H20mm.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/TRRS-PJ-320A-no-Fmask.kicad_mod b/TRRS-PJ-320A-no-Fmask.kicad_mod
index 5912daf..9cb6ab8 100644
--- a/TRRS-PJ-320A-no-Fmask.kicad_mod
+++ b/TRRS-PJ-320A-no-Fmask.kicad_mod
@@ -1,4 +1,4 @@
-(module TRRS-PJ-320A (layer F.Cu) (tedit 5B6A5132)
+(module TRRS-PJ-320A-no-Fmask (layer F.Cu) (tedit 5CD25241)
   (fp_text reference REF** (at 0 14.2) (layer Dwgs.User)
     (effects (font (size 1 1) (thickness 0.15)))
   )
@@ -18,4 +18,8 @@
   (pad "" np_thru_hole circle (at 0 8.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 0 1.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
   (pad 3 thru_hole oval (at 2.3 6.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask))
+  (pad 4 thru_hole oval (at 2.3 3.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask))
+  (pad 3 thru_hole oval (at 2.3 6.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask))
+  (pad 2 thru_hole oval (at 2.3 10.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask))
+  (pad 1 thru_hole oval (at -2.3 11.3) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask))
 )
diff --git a/WS2812B.kicad_mod b/WS2812B.kicad_mod
index e4dc9b6..b7797ad 100644
--- a/WS2812B.kicad_mod
+++ b/WS2812B.kicad_mod
@@ -1,4 +1,5 @@
-(module WS2812b (layer F.Cu) (tedit 5AA9518F)
+(module WS2812B (layer F.Cu) (tedit 5C99AFC9)
+  (attr smd)
   (fp_text reference LED4 (at 3.41 -0.06 270) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.2)))
   )
diff --git a/breakaway-hole-big.kicad_mod b/breakaway-hole-big.kicad_mod
new file mode 100644
index 0000000..670fad4
--- /dev/null
+++ b/breakaway-hole-big.kicad_mod
@@ -0,0 +1,10 @@
+(module breakaway-hole-big (layer F.Cu) (tedit 5CED8F6C)
+  (fp_text reference REF** (at 0 -3.048) (layer Dwgs.User) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value breakaway-hole-big (at 0 -4.75) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1 0) (end 1 0) (layer Dwgs.User) (width 0.15))
+  (pad "" np_thru_hole circle (at 0 -0.254) (size 0.7874 0.7874) (drill 0.7874) (layers *.Cu *.Mask))
+)
diff --git a/breakaway-hole.kicad_mod b/breakaway-hole.kicad_mod
new file mode 100644
index 0000000..a562037
--- /dev/null
+++ b/breakaway-hole.kicad_mod
@@ -0,0 +1,10 @@
+(module breakaway-hole (layer F.Cu) (tedit 5CDDCC9D)
+  (fp_text reference REF** (at 0 -3.048) (layer Dwgs.User) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value breakaway-hole (at 0 -4.75) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.595312 0) (end 0.595312 0) (layer Dwgs.User) (width 0.15))
+  (pad "" np_thru_hole circle (at 0 -0.254) (size 0.3937 0.3937) (drill 0.3937) (layers *.Cu *.Mask))
+)
diff --git a/breakaway-mousebites.kicad_mod b/breakaway-mousebites.kicad_mod
new file mode 100644
index 0000000..92bacc5
--- /dev/null
+++ b/breakaway-mousebites.kicad_mod
@@ -0,0 +1,14 @@
+(module breakaway-mousebites (layer F.Cu) (tedit 5B90EF0D)
+  (fp_text reference REF** (at 0 -3.048) (layer Dwgs.User) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value breakaway-mousebites (at 0 -4.75) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.794 0) (end 2.794 0) (layer Dwgs.User) (width 0.15))
+  (pad "" np_thru_hole circle (at 0 -0.254) (size 0.7874 0.7874) (drill 0.7874) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 1.27 -0.254) (size 0.7874 0.7874) (drill 0.7874) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 2.54 -0.254) (size 0.7874 0.7874) (drill 0.7874) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at -1.27 -0.254) (size 0.7874 0.7874) (drill 0.7874) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at -2.54 -0.254) (size 0.7874 0.7874) (drill 0.7874) (layers *.Cu *.Mask))
+)