diff --git a/fab.dcm b/fab.dcm
index 9f8fa926f771718117f8ad390e2ee8c4d4a3b90f..08216093e496eee2b3afde6a22aa93aa3d0b5260 100644
--- a/fab.dcm
+++ b/fab.dcm
@@ -475,6 +475,24 @@ K switch single-pole double-throw spdt ON-ON
 F https://www.ckswitches.com/media/1422/js.pdf
 $ENDCMP
 #
+$CMP Screw_Terminal_01x02_P3.5mm
+D TERM BLK 2POS SIDE ENT 3.5MM PCB
+K screw terminal
+F www.on-shore.com/wp-content/uploads/ED555XDS.pdf
+$ENDCMP
+#
+$CMP Screw_Terminal_01x02_P5mm
+D TERM BLK 2POS SIDE ENTRY 5MM PCB
+K screw terminal
+F https://www.on-shore.com/wp-content/uploads/OSTTAXX0161.pdf
+$ENDCMP
+#
+$CMP Screw_Terminal_01x03_P3.5mm
+D TERM BLK 3POS SIDE ENT 3.5MM PCB
+K screw terminal
+F www.on-shore.com/wp-content/uploads/ED555XDS.pdf
+$ENDCMP
+#
 $CMP Sensor_Accelerometer_ADXL343
 D 3-Axis MEMS Accelerometer, 2/4/8/16g range, I2C/SPI, LGA-14
 K 3-axis accelerometer i2c spi mems
diff --git a/fab.lib b/fab.lib
index 6d2ce53c8e291e4b71ca3e0480a52e25aa3588fa..848f6fd94e527caa4c4351002a440163d3ac562b 100644
--- a/fab.lib
+++ b/fab.lib
@@ -3145,6 +3145,79 @@ X C 3 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Screw_Terminal_01x02_P3.5mm
+#
+DEF Screw_Terminal_01x02_P3.5mm J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Screw_Terminal_01x02_P3.5mm" 0 -200 50 H V C CNN
+F2 "fab:TerminalBlock_OnShore_1x02_P3.50mm_Horizontal" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TerminalBlock*:*
+$ENDFPLIST
+DRAW
+C 0 -100 25 1 1 6 N
+C 0 0 25 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+P 2 1 1 6 -21 -87 13 -120 N
+P 2 1 1 6 -21 13 13 -20 N
+P 2 1 1 6 -14 -80 20 -113 N
+P 2 1 1 6 -14 20 20 -13 N
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Screw_Terminal_01x02_P5mm
+#
+DEF Screw_Terminal_01x02_P5mm J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Screw_Terminal_01x02_P5mm" 0 -200 50 H V C CNN
+F2 "fab:TerminalBlock_OnShore_1x02_P5.00mm_Horizontal" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TerminalBlock*:*
+$ENDFPLIST
+DRAW
+C 0 -100 25 1 1 6 N
+C 0 0 25 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+P 2 1 1 6 -21 -87 13 -120 N
+P 2 1 1 6 -21 13 13 -20 N
+P 2 1 1 6 -14 -80 20 -113 N
+P 2 1 1 6 -14 20 20 -13 N
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Screw_Terminal_01x03_P3.5mm
+#
+DEF Screw_Terminal_01x03_P3.5mm J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Screw_Terminal_01x03_P3.5mm" 0 -200 50 H V C CNN
+F2 "fab:TerminalBlock_OnShore_1x03_P3.50mm_Horizontal" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TerminalBlock*:*
+$ENDFPLIST
+DRAW
+C 0 -100 25 1 1 6 N
+C 0 0 25 1 1 6 N
+C 0 100 25 1 1 6 N
+S -50 150 50 -150 1 1 10 f
+P 2 1 1 6 -21 -87 13 -120 N
+P 2 1 1 6 -21 13 13 -20 N
+P 2 1 1 6 -21 113 13 80 N
+P 2 1 1 6 -14 -80 20 -113 N
+P 2 1 1 6 -14 20 20 -13 N
+P 2 1 1 6 -14 120 20 87 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Sensor_Accelerometer_ADXL343
 #
 DEF Sensor_Accelerometer_ADXL343 U 0 20 Y Y 1 F N
@@ -3228,75 +3301,6 @@ X 2 2 -200 -100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# TERM-1X02-ADAFRUIT
-#
-DEF TERM-1X02-ADAFRUIT J 0 40 N N 1 L N
-F0 "J" -100 225 45 H V L BNN
-F1 "TERM-1X02-ADAFRUIT" 0 0 45 H I L BNN
-F2 "fab:fab-3.5MMTERM" 30 150 20 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- *3.5MMTERM*
- *ED555DS-2DS*
-$ENDFPLIST
-DRAW
-T 0 -21 145 45 0 1 0 1 Normal 0 C C
-T 0 -21 45 45 0 1 0 2 Normal 0 C C
-P 2 1 0 0 -100 -100 200 -100 N
-P 2 1 0 0 -100 200 -100 -100 N
-P 2 1 0 0 200 -100 200 200 N
-P 2 1 0 0 200 200 -100 200 N
-X 1 1 0 100 100 R 40 40 1 1 P I
-X 2 2 0 0 100 R 40 40 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# TERM-1X02-FABLAB
-#
-DEF TERM-1X02-FABLAB J 0 40 N N 1 L N
-F0 "J" -100 225 45 H V L BNN
-F1 "TERM-1X02-FABLAB" 0 0 45 H I L BNN
-F2 "fab:fab-ED555DS-2DS" 30 150 20 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- *ED555DS-2DS*
-$ENDFPLIST
-DRAW
-T 0 -21 145 45 0 1 0 1 Normal 0 C C
-T 0 -21 45 45 0 1 0 2 Normal 0 C C
-P 2 1 0 0 -100 -100 200 -100 N
-P 2 1 0 0 -100 200 -100 -100 N
-P 2 1 0 0 200 -100 200 200 N
-P 2 1 0 0 200 200 -100 200 N
-X 1 1 0 100 100 R 40 40 1 1 P I
-X 2 2 0 0 100 R 40 40 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# TERM-1X03-FABLAB
-#
-DEF TERM-1X03-FABLAB M 0 40 N N 1 L N
-F0 "M" -100 225 45 H V L BNN
-F1 "TERM-1X03-FABLAB" 0 0 45 H I L BNN
-F2 "fab:fab-ED555DS-3DS" 30 150 20 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- *ED555DS-3DS*
-$ENDFPLIST
-DRAW
-T 0 -21 145 45 0 1 0 1 Normal 0 C C
-T 0 -21 45 45 0 1 0 2 Normal 0 C C
-T 0 -21 -54 45 0 1 0 3 Normal 0 C C
-P 2 1 0 0 -100 -200 200 -200 N
-P 2 1 0 0 -100 200 -100 -200 N
-P 2 1 0 0 200 -200 200 200 N
-P 2 1 0 0 200 200 -100 200 N
-X 1 1 0 100 100 R 40 40 1 1 P I
-X 2 2 0 0 100 R 40 40 1 1 P I
-X 3 3 0 -100 100 R 40 40 1 1 P I
-ENDDRAW
-ENDDEF
-#
 # Thermistor_NTC
 #
 DEF Thermistor_NTC TH 0 0 N Y 1 F N
diff --git a/fab.pretty/TerminalBlock_OnShore_1x02_P3.50mm_Horizontal.kicad_mod b/fab.pretty/TerminalBlock_OnShore_1x02_P3.50mm_Horizontal.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..2f7fb7eb88086412cd63cc6a040b43b7be8a41bd
--- /dev/null
+++ b/fab.pretty/TerminalBlock_OnShore_1x02_P3.50mm_Horizontal.kicad_mod
@@ -0,0 +1,33 @@
+(module TerminalBlock_OnShore_1x02_P3.50mm_Horizontal (layer F.Cu) (tedit 6059B09C)
+  (descr "2 Position Wire to Board Terminal Block Horizontal with Board 0.138\" (3.50mm) Through Hole")
+  (tags "THT Terminal Block pitch 3.5mm")
+  (fp_text reference REF** (at 1.75 -4.46) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value TerminalBlock_OnShore_1x02_P3.50mm_Horizontal (at 1.7 5.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.7 -2.6) (end 5.2 -2.6) (layer F.Fab) (width 0.1))
+  (fp_line (start 5.2 -2.6) (end 5.2 3.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 5.2 3.7) (end -0.6 3.7) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.6 3.7) (end -1.7 2.6) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.7 2.6) (end -1.7 -2.6) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.8 -2.7) (end 5.3 -2.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 3.8) (end 5.3 3.8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -2.7) (end -1.8 3.8) (layer F.SilkS) (width 0.12))
+  (fp_line (start 5.3 -2.7) (end 5.3 3.8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.1 -3) (end -2.1 4.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.1 4.1) (end 5.6 4.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.6 4.1) (end 5.6 -3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.6 -3) (end -2.1 -3) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 1.75 2.9) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 3.5 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/TerminalBlock_4Ucon.3dshapes/TerminalBlock_4Ucon_1x02_P3.50mm_Horizontal.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/TerminalBlock_OnShore_1x02_P5.00mm_Horizontal.kicad_mod b/fab.pretty/TerminalBlock_OnShore_1x02_P5.00mm_Horizontal.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..490022c3bfae6dddab64e9dcbc7fcd7fe869ee2e
--- /dev/null
+++ b/fab.pretty/TerminalBlock_OnShore_1x02_P5.00mm_Horizontal.kicad_mod
@@ -0,0 +1,33 @@
+(module TerminalBlock_OnShore_1x02_P5.00mm_Horizontal (layer F.Cu) (tedit 6059B07A)
+  (descr "2 Position Wire to Board Terminal Block Horizontal with Board 0.197\" (5.00mm) Through Hole")
+  (tags "THT Terminal Block pitch 5mm")
+  (fp_text reference REF** (at 2.5 -5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value TerminalBlock_OnShore_1x02_P5.00mm_Horizontal (at 2.5 6.3) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -3 -3.9) (end 8 -3.9) (layer F.Fab) (width 0.1))
+  (fp_line (start 8 -3.9) (end 8 5.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 8 5.1) (end -2.4 5.1) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.4 5.1) (end -3 4.5) (layer F.Fab) (width 0.1))
+  (fp_line (start -3 4.5) (end -3 -3.9) (layer F.Fab) (width 0.1))
+  (fp_line (start -3.1 -4) (end 8.1 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.1 5.2) (end 8.1 5.2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.1 -4) (end -3.1 5.2) (layer F.SilkS) (width 0.12))
+  (fp_line (start 8.1 -4) (end 8.1 5.2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.3 -4.2) (end -3.3 5.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.3 5.4) (end 8.3 5.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 8.3 5.4) (end 8.3 -4.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 8.3 -4.2) (end -3.3 -4.2) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 2.5 2.8) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 5 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/TerminalBlock_Philmore.3dshapes/TerminalBlock_Philmore_TB132_1x02_P5.00mm_Horizontal.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/TerminalBlock_OnShore_1x03_P3.50mm_Horizontal.kicad_mod b/fab.pretty/TerminalBlock_OnShore_1x03_P3.50mm_Horizontal.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..0d23a892f8ab4849c32c987e40881bb296030e15
--- /dev/null
+++ b/fab.pretty/TerminalBlock_OnShore_1x03_P3.50mm_Horizontal.kicad_mod
@@ -0,0 +1,34 @@
+(module TerminalBlock_OnShore_1x03_P3.50mm_Horizontal (layer F.Cu) (tedit 6059B04C)
+  (descr "3 Position Wire to Board Terminal Block Horizontal with Board 0.138\" (3.50mm) Through Hole")
+  (tags "THT Terminal Block pitch 3.5mm")
+  (fp_text reference REF** (at 3.8 -3.9) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value TerminalBlock_OnShore_1x03_P3.50mm_Horizontal (at 4.2 5.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.8 -2.7) (end 8.8 -2.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 8.8 -2.7) (end 8.8 3.8) (layer F.Fab) (width 0.1))
+  (fp_line (start 8.8 3.8) (end -0.7 3.8) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.7 3.8) (end -1.8 2.7) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.8 2.7) (end -1.8 -2.7) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.9 -2.8) (end 8.9 -2.8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.9 3.9) (end 8.9 3.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.9 -2.8) (end -1.9 3.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start 8.9 -2.8) (end 8.9 3.9) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.2 -3.1) (end -2.2 4.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -2.2 4.2) (end 9.2 4.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 9.2 4.2) (end 9.2 -3.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 9.2 -3.1) (end -2.2 -3.1) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 3.5 2.9) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 3.5 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 7 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/TerminalBlock_4Ucon.3dshapes/TerminalBlock_4Ucon_1x03_P3.50mm_Horizontal.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)