diff --git a/fab.dcm b/fab.dcm
index 6daffceea4339abb7f0ee5d7bbcc39651a778c97..35816140c500ab2f446bd0fb960cd97b628173c5 100644
--- a/fab.dcm
+++ b/fab.dcm
@@ -58,6 +58,24 @@ K battery charger lithium
 F http://ww1.microchip.com/downloads/en/DeviceDoc/MCP73831-Family-Data-Sheet-DS20001984H.pdf
 $ENDCMP
 #
+$CMP Conn_Header_JST_PH_1x02_P2mm_Vertical_SMD
+D Male JST PH 2 pin connector
+K male header JST PH
+F https://www.jst-mfg.com/product/pdf/eng/ePH.pdf
+$ENDCMP
+#
+$CMP Conn_Header_JST_PH_1x03_P2mm_Vertical_SMD
+D Male JST PH 3 pin connector
+K male header JST PH
+F https://www.jst-mfg.com/product/pdf/eng/ePH.pdf
+$ENDCMP
+#
+$CMP Conn_Header_JST_PH_1x04_P2mm_Vertical_SMD
+D Male JST PH 4 pin connector
+K male header JST PH
+F https://www.jst-mfg.com/product/pdf/eng/ePH.pdf
+$ENDCMP
+#
 $CMP Conn_PWRJack_0.7x2.35mm_CUIDevices_PJ1-023-SMT-TR
 D Power Barrel Connector Jack 0.70mm ID (0.028"), 2.35mm OD (0.093") EIAJ-1 Surface Mount, Right Angle
 K power barrel connector jack surface mount smt smd right angle
diff --git a/fab.lib b/fab.lib
index 7f60374233bbfc68e5ebfe49d3d9c62692a562b9..3d063100cd02a73c9c13177c433a8ac6d4d5fc51 100644
--- a/fab.lib
+++ b/fab.lib
@@ -296,6 +296,61 @@ X PROG 5 -400 -100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# Conn_Header_JST_PH_1x02_P2mm_Vertical_SMD
+#
+DEF Conn_Header_JST_PH_1x02_P2mm_Vertical_SMD J 0 40 Y Y 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Conn_Header_JST_PH_1x02_P2mm_Vertical_SMD" 0 -300 50 H V C CNN
+F2 "fab:Header_JST_PH_1x02_P2mm_Vertical_SMD" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ fab:*Header_SMD_01x??_*
+$ENDFPLIST
+DRAW
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+X ~ 1 200 0 150 L 50 50 1 1 P
+X ~ 2 200 -100 150 L 50 50 1 1 P
+X ~ 3 200 -200 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_Header_JST_PH_1x03_P2mm_Vertical_SMD
+#
+DEF Conn_Header_JST_PH_1x03_P2mm_Vertical_SMD J 0 40 Y Y 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Conn_Header_JST_PH_1x03_P2mm_Vertical_SMD" 0 -400 50 H V C CNN
+F2 "fab:Header_JST_PH_1x03_P2mm_Vertical_SMD" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ fab:*Header_SMD_01x??_*
+$ENDFPLIST
+DRAW
+X ~ 1 200 0 150 L 50 50 1 1 P
+X ~ 2 200 -100 150 L 50 50 1 1 P
+X ~ 3 200 -200 150 L 50 50 1 1 P
+X ~ 4 200 -300 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Conn_Header_JST_PH_1x04_P2mm_Vertical_SMD
+#
+DEF Conn_Header_JST_PH_1x04_P2mm_Vertical_SMD J 0 40 Y Y 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Conn_Header_JST_PH_1x04_P2mm_Vertical_SMD" 0 -400 50 H V C CNN
+F2 "fab:Header_JST_PH_1x04_P2mm_Vertical_SMD" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ fab:*Header_SMD_01x??_*
+$ENDFPLIST
+DRAW
+X ~ 1 200 0 150 L 50 50 1 1 P
+X ~ 2 200 -100 150 L 50 50 1 1 P
+X ~ 3 200 -200 150 L 50 50 1 1 P
+X ~ 4 200 -300 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Conn_PWRJack_0.7x2.35mm_CUIDevices_PJ1-023-SMT-TR
 #
 DEF Conn_PWRJack_0.7x2.35mm_CUIDevices_PJ1-023-SMT-TR J 0 20 Y N 1 F N
diff --git a/fab.pretty/Header_JST_PH_1x02_P2mm_Vertical_SMD.kicad_mod b/fab.pretty/Header_JST_PH_1x02_P2mm_Vertical_SMD.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..c87b74403425ad26f48b64cdaae75c78ca72eac1
--- /dev/null
+++ b/fab.pretty/Header_JST_PH_1x02_P2mm_Vertical_SMD.kicad_mod
@@ -0,0 +1,36 @@
+(module Header_JST_PH_1x02_P2mm_Vertical_SMD (layer F.Cu) (tedit 60B62B2C)
+  (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Header_JST_PH_1x02_P2mm_Vertical_SMD (at 0 -0.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 0.5 -2) (end 0.5 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 2.5) (end -4.5 4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 4) (end 0.5 2) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 1.2 -3) (end 1.4 -3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end -4 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 -4) (end 0 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 4) (end 0 4) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 4) (end -4 4) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end -4.5 -2.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -2.5) (end -4.25 -2.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 -2.5) (end -4.25 -2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 -2) (end -4.5 -2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -2) (end -4.5 2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 2) (end -4.25 2) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 2) (end -4.25 2.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 2.5) (end -4.5 2.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end 0.5 -4) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -4) (end 0.5 4) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 4) (end -4.5 4) (layer F.Fab) (width 0.1))
+  (fp_line (start -4.5 4) (end -4.5 -4) (layer F.Fab) (width 0.1))
+  (fp_line (start -4.75 -4.5) (end 3 -4.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 -4.5) (end 3 4.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 4.5) (end -4.75 4.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -4.75 4.5) (end -4.75 -4.5) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd rect (at 0 -1) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 0 1) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad "" smd rect (at -2 -3.4) (size 3.2 1.8) (layers F.Cu F.Paste F.Mask))
+  (pad "" smd rect (at -2 3.4) (size 3.2 1.8) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/fab.pretty/Header_JST_PH_1x03_P2mm_Vertical_SMD.kicad_mod b/fab.pretty/Header_JST_PH_1x03_P2mm_Vertical_SMD.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..3e955da9d09de764fc248600d1ae53ccbdeb61e8
--- /dev/null
+++ b/fab.pretty/Header_JST_PH_1x03_P2mm_Vertical_SMD.kicad_mod
@@ -0,0 +1,37 @@
+(module Header_JST_PH_1x03_P2mm_Vertical_SMD (layer F.Cu) (tedit 60B62BEA)
+  (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Header_JST_PH_1x03_P2mm_Vertical_SMD (at 0 -0.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 0.5 -2) (end 0.5 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 4.25) (end -4.5 6) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 6) (end 0.5 4) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 1.2 -3) (end 1.4 -3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end -4 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 -4) (end 0 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 6) (end 0 6) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 6) (end -4 6) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end -4.5 -2.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -2.25) (end -4.25 -2.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 -2.25) (end -4.25 -1.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 -1.75) (end -4.5 -1.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -1.75) (end -4.5 3.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 3.75) (end -4.25 3.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 3.75) (end -4.25 4.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 4.25) (end -4.5 4.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end 0.5 -4) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -4) (end 0.5 6) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 6) (end -4.5 6) (layer F.Fab) (width 0.1))
+  (fp_line (start -4.5 6) (end -4.5 -4) (layer F.Fab) (width 0.1))
+  (fp_line (start -4.75 -4.5) (end 3 -4.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 -4.5) (end 3 6.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 6.5) (end -4.75 6.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -4.75 6.5) (end -4.75 -4.5) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd rect (at 0 -1) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 0 1) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad "" smd rect (at -2 -3.4) (size 3.2 1.8) (layers F.Cu F.Paste F.Mask))
+  (pad "" smd rect (at -2 5.4) (size 3.2 1.8) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 0 3) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/fab.pretty/Header_JST_PH_1x04_P2mm_Vertical_SMD.kicad_mod b/fab.pretty/Header_JST_PH_1x04_P2mm_Vertical_SMD.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..c3c0bfecc05759b41480358eec23493a870ef808
--- /dev/null
+++ b/fab.pretty/Header_JST_PH_1x04_P2mm_Vertical_SMD.kicad_mod
@@ -0,0 +1,38 @@
+(module Header_JST_PH_1x04_P2mm_Vertical_SMD (layer F.Cu) (tedit 60B62BC6)
+  (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Header_JST_PH_1x04_P2mm_Vertical_SMD (at 0 -0.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 0.5 -2) (end 0.5 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 6.25) (end -4.5 8) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 8) (end 0.5 6) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 1.2 -3) (end 1.4 -3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end -4 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 -4) (end 0 -4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.5 8) (end 0 8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 8) (end -4 8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end -4.5 -2.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -2.25) (end -4.25 -2.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 -2.25) (end -4.25 -1.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 -1.75) (end -4.5 -1.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -1.75) (end -4.5 5.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 5.75) (end -4.25 5.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 5.75) (end -4.25 6.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.25 6.25) (end -4.5 6.25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.5 -4) (end 0.5 -4) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 -4) (end 0.5 8) (layer F.Fab) (width 0.1))
+  (fp_line (start 0.5 8) (end -4.5 8) (layer F.Fab) (width 0.1))
+  (fp_line (start -4.5 8) (end -4.5 -4) (layer F.Fab) (width 0.1))
+  (fp_line (start -4.75 -4.5) (end 3 -4.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 -4.5) (end 3 8.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3 8.5) (end -4.75 8.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -4.75 8.5) (end -4.75 -4.5) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd rect (at 0 -1) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 0 1) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad "" smd rect (at -2 -3.4) (size 3.2 1.8) (layers F.Cu F.Paste F.Mask))
+  (pad "" smd rect (at -2 7.4) (size 3.2 1.8) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 0 3) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at 0 5) (size 5.7 1.2) (layers F.Cu F.Paste F.Mask))
+)