From 1a2cdc1c4cdb3972778911a5d131f126fc68d29c Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Sun, 25 Apr 2021 11:10:47 +0300
Subject: [PATCH] Complete and rename single row THT pin headers from 1 to 16

---
 ...der_1x01_P2.54mm_Horizontal_SMD.kicad_mod} |  38 ++---
 ...r_1x01_P2.54mm_Vertical_THT_D1mm.kicad_mod |  32 ++++
 ...der_1x02_P2.54mm_Horizontal_SMD.kicad_mod} |  44 +++---
 ...r_1x02_P2.54mm_Vertical_THT_D1mm.kicad_mod |  33 ++++
 ...der_1x03_P2.54mm_Horizontal_SMD.kicad_mod} |  54 +++----
 ...r_1x03_P2.54mm_Vertical_THT_D1mm.kicad_mod |  34 ++++
 ...der_1x04_P2.54mm_Horizontal_SMD.kicad_mod} |  60 +++----
 ...r_1x04_P2.54mm_Vertical_THT_D1mm.kicad_mod |  35 +++++
 ...der_1x05_P2.54mm_Horizontal_SMD.kicad_mod} |  68 ++++----
 ..._1x05_P2.54mm_Vertical_THT_D1mm.kicad_mod} |  34 ++--
 ...der_1x06_P2.54mm_Horizontal_SMD.kicad_mod} |   6 +-
 ..._1x06_P2.54mm_Vertical_THT_D1mm.kicad_mod} |   6 +-
 ...der_1x07_P2.54mm_Horizontal_SMD.kicad_mod} |  84 +++++-----
 ..._1x07_P2.54mm_Vertical_THT_D1mm.kicad_mod} |   6 +-
 ...der_1x08_P2.54mm_Horizontal_SMD.kicad_mod} |   6 +-
 ..._1x08_P2.54mm_Vertical_THT_D1mm.kicad_mod} |   6 +-
 ...der_1x09_P2.54mm_Horizontal_SMD.kicad_mod} | 102 ++++++------
 ...r_1x09_P2.54mm_Vertical_THT_D1mm.kicad_mod |  42 +++++
 ...der_1x10_P2.54mm_Horizontal_SMD.kicad_mod} | 110 ++++++-------
 ...r_1x10_P2.54mm_Vertical_THT_D1mm.kicad_mod |  43 ++++++
 ...der_1x11_P2.54mm_Horizontal_SMD.kicad_mod} | 114 +++++++-------
 ...r_1x11_P2.54mm_Vertical_THT_D1mm.kicad_mod |  44 ++++++
 ...der_1x12_P2.54mm_Horizontal_SMD.kicad_mod} | 122 +++++++--------
 ...r_1x12_P2.54mm_Vertical_THT_D1mm.kicad_mod |  45 ++++++
 ...der_1x13_P2.54mm_Horizontal_SMD.kicad_mod} | 128 +++++++--------
 ...r_1x13_P2.54mm_Vertical_THT_D1mm.kicad_mod |  46 ++++++
 ...der_1x14_P2.54mm_Horizontal_SMD.kicad_mod} | 134 ++++++++--------
 ...r_1x14_P2.54mm_Vertical_THT_D1mm.kicad_mod |  47 ++++++
 ...der_1x15_P2.54mm_Horizontal_SMD.kicad_mod} | 138 ++++++++---------
 ...r_1x15_P2.54mm_Vertical_THT_D1mm.kicad_mod |  48 ++++++
 ...der_1x16_P2.54mm_Horizontal_SMD.kicad_mod} | 146 +++++++++---------
 ...r_1x16_P2.54mm_Vertical_THT_D1mm.kicad_mod |  49 ++++++
 ...Header_2x02_P1.27mm_Vertical_SMD.kicad_mod |  58 +++----
 ...Header_2x05_P1.27mm_Vertical_SMD.kicad_mod |  94 +++++------
 ...DI_01x06_P2.54mm_Horizontal_SMD.kicad_mod} |  76 ++++-----
 ...DI_01x02_P2.54mm_Horizontal_SMD.kicad_mod} |  44 +++---
 36 files changed, 1337 insertions(+), 839 deletions(-)
 rename fab.pretty/{Header_SMD_01x01_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x01_P2.54mm_Horizontal_SMD.kicad_mod} (87%)
 create mode 100644 fab.pretty/PinHeader_1x01_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x02_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x02_P2.54mm_Horizontal_SMD.kicad_mod} (93%)
 create mode 100644 fab.pretty/PinHeader_1x02_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x03_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x03_P2.54mm_Horizontal_SMD.kicad_mod} (91%)
 create mode 100644 fab.pretty/PinHeader_1x03_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x04_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x04_P2.54mm_Horizontal_SMD.kicad_mod} (94%)
 create mode 100644 fab.pretty/PinHeader_1x04_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x05_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x05_P2.54mm_Horizontal_SMD.kicad_mod} (95%)
 rename fab.pretty/{PinHeader_1x05_P2.54mm_Vertical_THT_Plain.kicad_mod => PinHeader_1x05_P2.54mm_Vertical_THT_D1mm.kicad_mod} (90%)
 rename fab.pretty/{Header_SMD_01x06_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x06_P2.54mm_Horizontal_SMD.kicad_mod} (93%)
 rename fab.pretty/{PinHeader_1x06_P2.54mm_Vertical_THT_Plain.kicad_mod => PinHeader_1x06_P2.54mm_Vertical_THT_D1mm.kicad_mod} (90%)
 rename fab.pretty/{Header_SMD_01x07_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x07_P2.54mm_Horizontal_SMD.kicad_mod} (96%)
 rename fab.pretty/{PinHeader_1x07_P2.54mm_Vertical_THT_Plain.kicad_mod => PinHeader_1x07_P2.54mm_Vertical_THT_D1mm.kicad_mod} (90%)
 rename fab.pretty/{Header_SMD_01x08_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x08_P2.54mm_Horizontal_SMD.kicad_mod} (94%)
 rename fab.pretty/{PinHeader_1x08_P2.54mm_Vertical_THT_Plain.kicad_mod => PinHeader_1x08_P2.54mm_Vertical_THT_D1mm.kicad_mod} (91%)
 rename fab.pretty/{Header_SMD_01x09_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x09_P2.54mm_Horizontal_SMD.kicad_mod} (95%)
 create mode 100644 fab.pretty/PinHeader_1x09_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x10_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x10_P2.54mm_Horizontal_SMD.kicad_mod} (95%)
 create mode 100644 fab.pretty/PinHeader_1x10_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x11_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x11_P2.54mm_Horizontal_SMD.kicad_mod} (97%)
 create mode 100644 fab.pretty/PinHeader_1x11_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x12_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x12_P2.54mm_Horizontal_SMD.kicad_mod} (95%)
 create mode 100644 fab.pretty/PinHeader_1x12_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x13_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x13_P2.54mm_Horizontal_SMD.kicad_mod} (96%)
 create mode 100644 fab.pretty/PinHeader_1x13_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x14_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x14_P2.54mm_Horizontal_SMD.kicad_mod} (96%)
 create mode 100644 fab.pretty/PinHeader_1x14_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x15_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x15_P2.54mm_Horizontal_SMD.kicad_mod} (97%)
 create mode 100644 fab.pretty/PinHeader_1x15_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_01x16_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_1x16_P2.54mm_Horizontal_SMD.kicad_mod} (96%)
 create mode 100644 fab.pretty/PinHeader_1x16_P2.54mm_Vertical_THT_D1mm.kicad_mod
 rename fab.pretty/{Header_SMD_FTDI_01x06_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_FTDI_01x06_P2.54mm_Horizontal_SMD.kicad_mod} (96%)
 rename fab.pretty/{Header_SMD_UPDI_01x02_P2.54mm_Horizontal_Male.kicad_mod => PinHeader_UPDI_01x02_P2.54mm_Horizontal_SMD.kicad_mod} (93%)

diff --git a/fab.pretty/Header_SMD_01x01_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x01_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 87%
rename from fab.pretty/Header_SMD_01x01_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x01_P2.54mm_Horizontal_SMD.kicad_mod
index 8a66b76..842ce70 100644
--- a/fab.pretty/Header_SMD_01x01_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x01_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,30 +1,30 @@
-(module Header_SMD_01x01_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC9564)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x01_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 608518C2)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x01_P2.54mm_Horizontal_Male (at 2.6 3.2) (layer F.Fab)
+  (fp_text value PinHeader_1x01 (at 2.6 3.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 1.397) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 1.397) (end 3.81 1.397) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 1.397) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.36 1.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 1.4) (end 6.36 1.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 1.4) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 1.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 1.9) (end 6.4 1.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 1.9) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 1.9) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 1.9) (end 6.4 1.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 1.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 1.4) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 1.4) (end 6.36 1.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.36 1.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 1.397) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 1.397) (end 3.81 1.397) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 1.397) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.5 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x01_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x01_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..a548c2a
--- /dev/null
+++ b/fab.pretty/PinHeader_1x01_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,32 @@
+(module PinHeader_1x01_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 608522DE)
+  (descr "Through hole straight pin header, 2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x01 (at 0 3.1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 1.8) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 1.8) (end 1.8 1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.27 -1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -1.27) (end -1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 1.27) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 1.27) (end -1.27 1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_text user %R (at 0 -0.6 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole oval (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x05_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x02_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x02_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 93%
rename from fab.pretty/Header_SMD_01x02_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x02_P2.54mm_Horizontal_SMD.kicad_mod
index 293aebb..36666aa 100644
--- a/fab.pretty/Header_SMD_01x02_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x02_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,34 +1,34 @@
-(module Header_SMD_01x02_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFCB1CB)
+(module PinHeader_1x02_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 608518ED)
   (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x02_P2.54mm_Horizontal_Male (at 0 5.715) (layer F.Fab)
+  (fp_text value PinHeader_1x02 (at 0 5.715) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 3.81) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 3.81) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 3.81) (end 6.35 3.81) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 3.81) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 4.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 4.3) (end 6.4 4.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 4.3) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 4.3) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 4.3) (end 6.4 4.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 4.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 3.81) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 3.81) (end 6.35 3.81) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 3.81) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 3.81) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 3.81) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.6 1.2 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x02_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x02_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..74a4b98
--- /dev/null
+++ b/fab.pretty/PinHeader_1x02_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,33 @@
+(module PinHeader_1x02_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852300)
+  (descr "Through hole straight pin header, 2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x02 (at 0 5.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.27 -1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 3.81) (end 1.27 3.81) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -1.27) (end -1.27 3.81) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 4.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 4.4) (end 1.8 4.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 4.4) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 0 1.5 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x05_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x03_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x03_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 91%
rename from fab.pretty/Header_SMD_01x03_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x03_P2.54mm_Horizontal_SMD.kicad_mod
index 32a2469..af669cc 100644
--- a/fab.pretty/Header_SMD_01x03_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x03_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,38 +1,38 @@
-(module Header_SMD_01x03_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC95A6)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x03_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851908)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x03_P2.54mm_Horizontal_Male (at 2.6 8.3) (layer F.Fab)
+  (fp_text value PinHeader_1x03 (at 2.6 8.3) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 6.9) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 6.9) (end 6.4 6.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 6.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 6.35) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 6.35) (end 6.35 6.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 6.35) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 6.35) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 6.35) (end 3.81 6.35) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 6.35) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 6.35) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 6.35) (end 3.81 6.35) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 6.35) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 6.35) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 6.35) (end 6.35 6.35) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 6.35) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 6.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 6.9) (end 6.4 6.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 6.9) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_text user %R (at 2.4 2.6 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x03_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x03_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..75dbfc6
--- /dev/null
+++ b/fab.pretty/PinHeader_1x03_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,34 @@
+(module PinHeader_1x03_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852318)
+  (descr "Through hole straight pin header, 2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x03 (at 0 8.1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 6.9) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 6.9) (end 1.8 6.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 6.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.27 -1.27) (end 1.27 6.35) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -1.27) (end -1.27 6.35) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 6.35) (end 1.27 6.35) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 6.35) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 6.35) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_text user %R (at 0 3.3 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x05_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x04_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x04_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 94%
rename from fab.pretty/Header_SMD_01x04_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x04_P2.54mm_Horizontal_SMD.kicad_mod
index 03d8db8..c8b9968 100644
--- a/fab.pretty/Header_SMD_01x04_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x04_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,42 +1,42 @@
-(module Header_SMD_01x04_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFCB1D6)
+(module PinHeader_1x04_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 6085192B)
   (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x04_P2.54mm_Horizontal_Male (at 0 10.795) (layer F.Fab)
+  (fp_text value PinHeader_1x04 (at 0 10.795) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 8.89) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 8.89) (end 3.81 8.89) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 8.89) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 8.89) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 8.89) (end 6.35 8.89) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 8.89) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 9.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 9.4) (end 6.4 9.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 9.4) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 9.4) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 9.4) (end 6.4 9.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 9.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.8 8.89) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 8.89) (end 6.35 8.89) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 8.89) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 8.89) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 8.89) (end 3.81 8.89) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 8.89) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.5 3.9 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x04_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x04_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..4e2ece6
--- /dev/null
+++ b/fab.pretty/PinHeader_1x04_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,35 @@
+(module PinHeader_1x04_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852327)
+  (descr "Through hole straight pin header, 2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x04 (at 0 10.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.27 -1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 8.89) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 8.89) (end -1.27 8.89) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 8.89) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 8.89) (end 1.27 8.89) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -1.27) (end -1.27 8.89) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 -1.27) (end 1.27 8.89) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 9.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 9.4) (end 1.8 9.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 9.4) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 0 5.08 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x05_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x05_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x05_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 95%
rename from fab.pretty/Header_SMD_01x05_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x05_P2.54mm_Horizontal_SMD.kicad_mod
index 9e09161..5d1cf55 100644
--- a/fab.pretty/Header_SMD_01x05_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x05_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,46 +1,46 @@
-(module Header_SMD_01x05_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFCB1DD)
+(module PinHeader_1x05_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851946)
   (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x05_P2.54mm_Horizontal_Male (at 0 13.335) (layer F.Fab)
+  (fp_text value PinHeader_1x05 (at 0 13.335) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 12) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 12) (end 6.4 12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 12) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 11.43) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 11.43) (end 6.35 11.43) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 11.43) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 11.43) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 11.43) (end 3.81 11.43) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 11.43) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 11.43) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 11.43) (end 3.81 11.43) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 11.43) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 11.43) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 11.43) (end 6.35 11.43) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 11.43) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 12) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 12) (end 6.4 12) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 12) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_text user %R (at 2.54 5.08 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x05_P2.54mm_Vertical_THT_Plain.kicad_mod b/fab.pretty/PinHeader_1x05_P2.54mm_Vertical_THT_D1mm.kicad_mod
similarity index 90%
rename from fab.pretty/PinHeader_1x05_P2.54mm_Vertical_THT_Plain.kicad_mod
rename to fab.pretty/PinHeader_1x05_P2.54mm_Vertical_THT_D1mm.kicad_mod
index 34b952a..0ba9e20 100644
--- a/fab.pretty/PinHeader_1x05_P2.54mm_Vertical_THT_Plain.kicad_mod
+++ b/fab.pretty/PinHeader_1x05_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -1,31 +1,31 @@
-(module PinHeader_1x05_P2.54mm_Vertical_THT_Plain (layer F.Cu) (tedit 608516D3)
+(module PinHeader_1x05_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852338)
   (descr "Through hole straight pin header, 1x05, 2.54mm pitch, single row")
   (tags "Through hole pin header THT 1x05 2.54mm single row")
   (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value PinHeader_1x05_Plain (at 0 12.49) (layer F.Fab)
+  (fp_text value PinHeader_1x05 (at 0 12.9) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.27 -1.27) (end 1.27 11.43) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.27 11.43) (end -1.27 11.43) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 11.43) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.33 11.49) (end 1.33 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 1.33 1.27) (end 1.33 11.49) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.33 1.27) (end 1.33 1.27) (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 1.8 11.95) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.8 11.95) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 11.95) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 11.95) (end 1.8 11.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 11.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.33 -1.33) (end 0 -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.27) (end 1.33 1.27) (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 -1.33 1.27) (end -1.33 11.49) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.33 11.49) (end 1.33 11.49) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 11.43) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 11.43) (end -1.27 11.43) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 11.43) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 0 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 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
diff --git a/fab.pretty/Header_SMD_01x06_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x06_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 93%
rename from fab.pretty/Header_SMD_01x06_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x06_P2.54mm_Horizontal_SMD.kicad_mod
index ea06cc5..b1c404a 100644
--- a/fab.pretty/Header_SMD_01x06_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x06_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,11 +1,11 @@
-(module Header_SMD_01x06_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC9606)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x06_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 608519EA)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x06_P2.54mm_Horizontal_Male (at 2.286 15.621) (layer F.Fab)
+  (fp_text value PinHeader_1x06 (at 2.286 15.621) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
diff --git a/fab.pretty/PinHeader_1x06_P2.54mm_Vertical_THT_Plain.kicad_mod b/fab.pretty/PinHeader_1x06_P2.54mm_Vertical_THT_D1mm.kicad_mod
similarity index 90%
rename from fab.pretty/PinHeader_1x06_P2.54mm_Vertical_THT_Plain.kicad_mod
rename to fab.pretty/PinHeader_1x06_P2.54mm_Vertical_THT_D1mm.kicad_mod
index c4e15b8..51457fd 100644
--- a/fab.pretty/PinHeader_1x06_P2.54mm_Vertical_THT_Plain.kicad_mod
+++ b/fab.pretty/PinHeader_1x06_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -1,10 +1,10 @@
-(module PinHeader_1x06_P2.54mm_Vertical_THT_Plain (layer F.Cu) (tedit 608516F9)
+(module PinHeader_1x06_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852347)
   (descr "Through hole straight pin header, 1x06, 2.54mm pitch, single row")
   (tags "Through hole pin header THT 1x06 2.54mm single row")
   (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value PinHeader_1x06_Plain (at 0 15.03) (layer F.Fab)
+  (fp_text value PinHeader_1x06 (at 0 15.03) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
@@ -25,7 +25,7 @@
   (fp_text user %R (at 0 6.35 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 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
diff --git a/fab.pretty/Header_SMD_01x07_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x07_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 96%
rename from fab.pretty/Header_SMD_01x07_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x07_P2.54mm_Horizontal_SMD.kicad_mod
index 24f008c..da322d2 100644
--- a/fab.pretty/Header_SMD_01x07_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x07_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,54 +1,54 @@
-(module Header_SMD_01x07_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFCB1E9)
+(module PinHeader_1x07_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851979)
   (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x07_P2.54mm_Horizontal_Male (at 0 18.415) (layer F.Fab)
+  (fp_text value PinHeader_1x07 (at 0 18.415) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 17) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 17) (end 6.4 17) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 17) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 16.51) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 16.51) (end 6.35 16.51) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 16.51) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 16.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 16.51) (end 3.81 16.51) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 16.51) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 16.51) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 16.51) (end 3.81 16.51) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 16.51) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 16.51) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 16.51) (end 6.35 16.51) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 16.51) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 17) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 17) (end 6.4 17) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 17) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
   (fp_text user %R (at 2.6 7.62 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x07_P2.54mm_Vertical_THT_Plain.kicad_mod b/fab.pretty/PinHeader_1x07_P2.54mm_Vertical_THT_D1mm.kicad_mod
similarity index 90%
rename from fab.pretty/PinHeader_1x07_P2.54mm_Vertical_THT_Plain.kicad_mod
rename to fab.pretty/PinHeader_1x07_P2.54mm_Vertical_THT_D1mm.kicad_mod
index 1046df9..508f5f7 100644
--- a/fab.pretty/PinHeader_1x07_P2.54mm_Vertical_THT_Plain.kicad_mod
+++ b/fab.pretty/PinHeader_1x07_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -1,10 +1,10 @@
-(module PinHeader_1x07_P2.54mm_Vertical_THT_Plain (layer F.Cu) (tedit 6085175C)
+(module PinHeader_1x07_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852354)
   (descr "Through hole straight pin header, 1x07, 2.54mm pitch, single row")
   (tags "Through hole pin header THT 1x07 2.54mm single row")
   (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value PinHeader_1x07_Plain (at 0 17.57) (layer F.Fab)
+  (fp_text value PinHeader_1x07 (at 0 17.57) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
@@ -25,7 +25,7 @@
   (fp_text user %R (at 0 7.62 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 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
diff --git a/fab.pretty/Header_SMD_01x08_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x08_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 94%
rename from fab.pretty/Header_SMD_01x08_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x08_P2.54mm_Horizontal_SMD.kicad_mod
index 4107f56..6cf0c14 100644
--- a/fab.pretty/Header_SMD_01x08_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x08_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,11 +1,11 @@
-(module Header_SMD_01x08_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC9647)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x08_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 608519DA)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x08_P2.54mm_Horizontal_Male (at 0.1 20.955) (layer F.Fab)
+  (fp_text value PinHeader_1x08 (at 0.1 20.955) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
diff --git a/fab.pretty/PinHeader_1x08_P2.54mm_Vertical_THT_Plain.kicad_mod b/fab.pretty/PinHeader_1x08_P2.54mm_Vertical_THT_D1mm.kicad_mod
similarity index 91%
rename from fab.pretty/PinHeader_1x08_P2.54mm_Vertical_THT_Plain.kicad_mod
rename to fab.pretty/PinHeader_1x08_P2.54mm_Vertical_THT_D1mm.kicad_mod
index 7e2e6b5..c63c8ee 100644
--- a/fab.pretty/PinHeader_1x08_P2.54mm_Vertical_THT_Plain.kicad_mod
+++ b/fab.pretty/PinHeader_1x08_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -1,10 +1,10 @@
-(module PinHeader_1x08_P2.54mm_Vertical_THT_Plain (layer F.Cu) (tedit 6085177A)
+(module PinHeader_1x08_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852363)
   (descr "Through hole straight pin header, 1x08, 2.54mm pitch, single row")
   (tags "Through hole pin header THT 1x08 2.54mm single row")
   (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value PinHeader_1x08_Plain (at 0 20.11) (layer F.Fab)
+  (fp_text value PinHeader_1x08 (at 0 20.11) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
@@ -25,7 +25,7 @@
   (fp_text user %R (at 0 8.89 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 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
   (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
diff --git a/fab.pretty/Header_SMD_01x09_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x09_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 95%
rename from fab.pretty/Header_SMD_01x09_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x09_P2.54mm_Horizontal_SMD.kicad_mod
index 9943e3d..6161f40 100644
--- a/fab.pretty/Header_SMD_01x09_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x09_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,62 +1,62 @@
-(module Header_SMD_01x09_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC965E)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x09_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 608519BB)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x09_P2.54mm_Horizontal_Male (at 0.1 23.495) (layer F.Fab)
+  (fp_text value PinHeader_1x09 (at 0.1 23.495) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 21.59) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 21.59) (end 3.81 21.59) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 21.59) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 21.59) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 21.59) (end 6.35 21.59) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 21.59) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 22.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 22.1) (end 6.4 22.1) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 22.1) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
   (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 22.1) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 22.1) (end 6.4 22.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 22.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.8 21.59) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 21.59) (end 6.35 21.59) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 21.59) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 21.59) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 21.59) (end 3.81 21.59) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 21.59) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.54 10.16 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x09_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x09_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..9ff43f7
--- /dev/null
+++ b/fab.pretty/PinHeader_1x09_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,42 @@
+(module PinHeader_1x09_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852371)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x09 (at 0 23.2) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 21.59) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 21.59) (end -1.27 21.59) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 21.59) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 21.59) (end 1.27 21.59) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 21.59) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 21.59) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 22.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 22.1) (end 1.8 22.1) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 22.1) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x10_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x10_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 95%
rename from fab.pretty/Header_SMD_01x10_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x10_P2.54mm_Horizontal_SMD.kicad_mod
index 88356b1..1a2763e 100644
--- a/fab.pretty/Header_SMD_01x10_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x10_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,66 +1,66 @@
-(module Header_SMD_01x10_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC9677)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x10_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851A1D)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x10_P2.54mm_Horizontal_Male (at 0 26.035) (layer F.Fab)
+  (fp_text value PinHeader_1x10 (at 0 26.035) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 24.7) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 24.7) (end 6.4 24.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 24.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 24.13) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 24.13) (end 6.35 24.13) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 24.13) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 24.13) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 24.13) (end 3.81 24.13) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 24.13) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 24.13) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 24.13) (end 3.81 24.13) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 24.13) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 24.13) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 24.13) (end 6.35 24.13) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 24.13) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 24.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 24.7) (end 6.4 24.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 24.7) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
   (fp_text user %R (at 2.54 11.43 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x10_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x10_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..2da9f11
--- /dev/null
+++ b/fab.pretty/PinHeader_1x10_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,43 @@
+(module PinHeader_1x10_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 6085237E)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x10 (at 0 25.8) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 24.13) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 24.13) (end -1.27 24.13) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 24.13) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 24.13) (end 1.27 24.13) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 24.13) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 24.13) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 24.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 24.6) (end 1.8 24.6) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 24.6) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x11_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x11_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 97%
rename from fab.pretty/Header_SMD_01x11_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x11_P2.54mm_Horizontal_SMD.kicad_mod
index 342afed..372783a 100644
--- a/fab.pretty/Header_SMD_01x11_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x11_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,69 +1,69 @@
-(module Header_SMD_01x11_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFCB1F6)
+(module PinHeader_1x11_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851A37)
   (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x11_P2.54mm_Horizontal_Male (at 0 28.575) (layer F.Fab)
+  (fp_text value PinHeader_1x11 (at 0 28.575) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 27.2) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 27.2) (end 6.4 27.2) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 27.2) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 26.67) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 26.67) (end 6.35 26.67) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 26.67) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 26.67) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 26.67) (end 3.81 26.67) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 26.67) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 26.67) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 26.67) (end 3.81 26.67) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 26.67) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 26.67) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 26.67) (end 6.35 26.67) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 26.67) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 27.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 27.2) (end 6.4 27.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 27.2) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.54 12.7 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x11_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x11_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..5aebc8d
--- /dev/null
+++ b/fab.pretty/PinHeader_1x11_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,44 @@
+(module PinHeader_1x11_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 6085238C)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x11 (at 0 28.3) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 27.2) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 27.2) (end 1.8 27.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 27.2) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 26.67) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 26.67) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 26.67) (end 1.27 26.67) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 26.67) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 26.67) (end -1.27 26.67) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 26.67) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x12_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x12_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 95%
rename from fab.pretty/Header_SMD_01x12_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x12_P2.54mm_Horizontal_SMD.kicad_mod
index b3bbc36..462c4f7 100644
--- a/fab.pretty/Header_SMD_01x12_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x12_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,72 +1,72 @@
-(module Header_SMD_01x12_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC96A5)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x12_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851A5A)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x12_P2.54mm_Horizontal_Male (at 0 31.115) (layer F.Fab)
+  (fp_text value PinHeader_1x12 (at 0 31.115) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 29.21) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 29.21) (end 3.81 29.21) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 29.21) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 29.21) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 29.21) (end 6.35 29.21) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 29.21) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 29.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 29.7) (end 6.4 29.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 29.7) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
   (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 29.7) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 29.7) (end 6.4 29.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 29.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 29.21) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 29.21) (end 6.35 29.21) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 29.21) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 29.21) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 29.21) (end 3.81 29.21) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 29.21) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.54 13.97 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x12_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x12_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..058828f
--- /dev/null
+++ b/fab.pretty/PinHeader_1x12_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,45 @@
+(module PinHeader_1x12_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 60852399)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x12 (at 0 30.8) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 29.7) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 29.7) (end 1.8 29.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 29.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 29.21) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 29.21) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 29.21) (end 1.27 29.21) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 29.21) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 29.21) (end -1.27 29.21) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 29.21) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at 0 27.94) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x13_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x13_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 96%
rename from fab.pretty/Header_SMD_01x13_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x13_P2.54mm_Horizontal_SMD.kicad_mod
index 7fc77b2..24d59a7 100644
--- a/fab.pretty/Header_SMD_01x13_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x13_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,75 +1,75 @@
-(module Header_SMD_01x13_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC96BD)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x13_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851A72)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x13_P2.54mm_Horizontal_Male (at 0 33.655) (layer F.Fab)
+  (fp_text value PinHeader_1x13 (at 0 33.655) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 32.3) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 32.3) (end 6.4 32.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 32.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 31.75) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 31.75) (end 6.35 31.75) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 31.75) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 31.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 31.75) (end 3.81 31.75) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 31.75) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 31.75) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 31.75) (end 3.81 31.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 31.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 31.75) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 31.75) (end 6.35 31.75) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 31.75) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 32.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 32.3) (end 6.4 32.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 32.3) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
   (fp_text user %R (at 2.54 15.24 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x13_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x13_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..1c0f78f
--- /dev/null
+++ b/fab.pretty/PinHeader_1x13_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,46 @@
+(module PinHeader_1x13_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 608523A7)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x13 (at 0 33.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 32.3) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 32.3) (end 1.8 32.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 32.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 31.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 31.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 31.75) (end 1.27 31.75) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 31.75) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 31.75) (end -1.27 31.75) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 31.75) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at 0 27.94) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 13 thru_hole oval (at 0 30.48) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x14_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x14_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 96%
rename from fab.pretty/Header_SMD_01x14_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x14_P2.54mm_Horizontal_SMD.kicad_mod
index c8ca030..7e6c503 100644
--- a/fab.pretty/Header_SMD_01x14_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x14_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,78 +1,78 @@
-(module Header_SMD_01x14_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC96E5)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x14_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851A89)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x14_P2.54mm_Horizontal_Male (at 0 36.195) (layer F.Fab)
+  (fp_text value PinHeader_1x14 (at 0 36.195) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 3.81 32.766) (end 1.27 32.766) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 33.274) (end 1.27 33.274) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 33.02) (end -0.635 33.02) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 34.8) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 34.8) (end 6.4 34.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 34.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 34.29) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 34.29) (end 6.35 34.29) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 34.29) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 34.29) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 34.29) (end 3.81 34.29) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 34.29) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 34.29) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 34.29) (end 3.81 34.29) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 34.29) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 34.29) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 34.29) (end 6.35 34.29) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 34.29) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 34.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 34.8) (end 6.4 34.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 34.8) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 33.02) (end -0.635 33.02) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 33.274) (end 1.27 33.274) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 32.766) (end 1.27 32.766) (layer F.SilkS) (width 0.12))
   (fp_text user %R (at 2.54 16.51 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x14_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x14_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..bd56944
--- /dev/null
+++ b/fab.pretty/PinHeader_1x14_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,47 @@
+(module PinHeader_1x14_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 608523B5)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x14 (at 0 35.9) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 34.8) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 34.8) (end 1.8 34.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 34.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 34.29) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 34.29) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 34.29) (end 1.27 34.29) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 34.29) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 34.29) (end -1.27 34.29) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 34.29) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at 0 27.94) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 13 thru_hole oval (at 0 30.48) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 14 thru_hole oval (at 0 33.02) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x15_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x15_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 97%
rename from fab.pretty/Header_SMD_01x15_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x15_P2.54mm_Horizontal_SMD.kicad_mod
index 98cfdc4..a330972 100644
--- a/fab.pretty/Header_SMD_01x15_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x15_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,81 +1,81 @@
-(module Header_SMD_01x15_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC96FC)
+(module PinHeader_1x15_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851A9F)
   (descr "datasheet: https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x15_P2.54mm_Horizontal_Male (at 0 38.735) (layer F.Fab)
+  (fp_text value PinHeader_1x15 (at 0 38.735) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 3.81 35.306) (end 1.27 35.306) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 35.56) (end -0.635 35.56) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 35.814) (end 1.27 35.814) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 32.766) (end 1.27 32.766) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 33.274) (end 1.27 33.274) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 33.02) (end -0.635 33.02) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 37.4) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 37.4) (end 6.4 37.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 -1.8) (end -1.8 37.4) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.8 36.83) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 36.83) (end 6.35 36.83) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 36.83) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 36.83) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 36.83) (end 3.81 36.83) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 36.83) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
   (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 36.83) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 36.83) (end 3.81 36.83) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 36.83) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 36.83) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 36.83) (end 6.35 36.83) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 36.83) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.8 -1.8) (end -1.8 37.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 37.4) (end 6.4 37.4) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 37.4) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 33.02) (end -0.635 33.02) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 33.274) (end 1.27 33.274) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 32.766) (end 1.27 32.766) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 35.814) (end 1.27 35.814) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 35.56) (end -0.635 35.56) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 35.306) (end 1.27 35.306) (layer F.SilkS) (width 0.12))
   (fp_text user %R (at 2.54 17.78 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x15_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x15_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..bb27fd3
--- /dev/null
+++ b/fab.pretty/PinHeader_1x15_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,48 @@
+(module PinHeader_1x15_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 608523C2)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x15 (at 0 38.3) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 37.3) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 37.3) (end 1.8 37.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 37.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 36.83) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 36.83) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 36.83) (end 1.27 36.83) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 36.83) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 36.83) (end -1.27 36.83) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 36.83) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at 0 27.94) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 13 thru_hole oval (at 0 30.48) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 14 thru_hole oval (at 0 33.02) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 15 thru_hole oval (at 0 35.56) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/Header_SMD_01x16_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_1x16_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 96%
rename from fab.pretty/Header_SMD_01x16_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_1x16_P2.54mm_Horizontal_SMD.kicad_mod
index eecf14e..8c81bf0 100644
--- a/fab.pretty/Header_SMD_01x16_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_1x16_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,84 +1,84 @@
-(module Header_SMD_01x16_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFC9712)
-  (descr "https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf")
+(module PinHeader_1x16_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851AB5)
+  (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_01x16_P2.54mm_Horizontal_Male (at 0 41.275) (layer F.Fab)
+  (fp_text value PinHeader_1x16 (at 0 41.275) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 39.37) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 39.37) (end 3.81 39.37) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 39.37) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 39.37) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 39.37) (end 6.35 39.37) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 39.37) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 39.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 39.9) (end 6.4 39.9) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 39.9) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
-  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 33.02) (end -0.635 33.02) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 33.274) (end 1.27 33.274) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 32.766) (end 1.27 32.766) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 35.814) (end 1.27 35.814) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 35.56) (end -0.635 35.56) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 35.306) (end 1.27 35.306) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 38.354) (end 1.27 38.354) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 38.1) (end -0.635 38.1) (layer F.Fab) (width 0.1))
   (fp_line (start 3.81 37.846) (end 1.27 37.846) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 38.1) (end -0.635 38.1) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 38.354) (end 1.27 38.354) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 35.306) (end 1.27 35.306) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 35.56) (end -0.635 35.56) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 35.814) (end 1.27 35.814) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 32.766) (end 1.27 32.766) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 33.274) (end 1.27 33.274) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 33.02) (end -0.635 33.02) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 30.734) (end 1.27 30.734) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.226) (end 1.27 30.226) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 30.48) (end -0.635 30.48) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 28.194) (end 1.27 28.194) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 27.94) (end -0.635 27.94) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 27.686) (end 1.27 27.686) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.4) (end -0.635 25.4) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 25.146) (end 1.27 25.146) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 25.654) (end 1.27 25.654) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 23.114) (end 1.27 23.114) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 22.606) (end -0.635 23.114) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 22.86) (end -0.635 22.86) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 22.606) (end 1.27 22.606) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.574) (end 1.27 20.574) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.066) (end 1.27 20.066) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 20.32) (end -0.635 20.32) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 20.066) (end -0.635 20.574) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 18.034) (end 1.27 18.034) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 17.526) (end 1.27 17.526) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 17.526) (end -0.635 18.034) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 17.78) (end -0.635 17.78) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 15.494) (end 1.27 15.494) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 14.986) (end -0.635 15.494) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 14.986) (end 1.27 14.986) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 15.24) (end -0.635 15.24) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 39.9) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 39.9) (end 6.4 39.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 39.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 39.37) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 39.37) (end 6.35 39.37) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 39.37) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 39.37) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 39.37) (end 3.81 39.37) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 39.37) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.54 19.05 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_1x16_P2.54mm_Vertical_THT_D1mm.kicad_mod b/fab.pretty/PinHeader_1x16_P2.54mm_Vertical_THT_D1mm.kicad_mod
new file mode 100644
index 0000000..2cce311
--- /dev/null
+++ b/fab.pretty/PinHeader_1x16_P2.54mm_Vertical_THT_D1mm.kicad_mod
@@ -0,0 +1,49 @@
+(module PinHeader_1x16_P2.54mm_Vertical_THT_D1mm (layer F.Cu) (tedit 608523CF)
+  (descr "Through hole straight pin header,  2.54mm pitch, single row")
+  (tags "Through hole pin header THT 2.54mm single row")
+  (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value PinHeader_1x16 (at 0 41) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.8 39.9) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 39.9) (end 1.8 39.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 39.9) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 0) (end -1.27 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 1.27) (end 1.27 39.37) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 1.27) (end -1.27 39.37) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 39.37) (end 1.27 39.37) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 39.37) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 39.37) (end -1.27 39.37) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.27 -1.27) (end 1.27 39.37) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_text user %R (at 0 8.89 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at 0 27.94) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 13 thru_hole oval (at 0 30.48) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 14 thru_hole oval (at 0 33.02) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 15 thru_hole oval (at 0 35.56) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 16 thru_hole oval (at 0 38.1) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x08_P2.54mm_Vertical.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
diff --git a/fab.pretty/PinHeader_2x02_P1.27mm_Vertical_SMD.kicad_mod b/fab.pretty/PinHeader_2x02_P1.27mm_Vertical_SMD.kicad_mod
index 1608230..bc2392a 100644
--- a/fab.pretty/PinHeader_2x02_P1.27mm_Vertical_SMD.kicad_mod
+++ b/fab.pretty/PinHeader_2x02_P1.27mm_Vertical_SMD.kicad_mod
@@ -1,41 +1,41 @@
-(module PinHeader_2x02_P1.27mm_Vertical_SMD (layer F.Cu) (tedit 59FED6E3)
+(module PinHeader_2x02_P1.27mm_Vertical_SMD (layer F.Cu) (tedit 60851B4E)
   (descr "surface-mounted straight pin header, 2x02, 1.27mm pitch, double rows")
   (tags "Surface mounted pin header SMD 2x02 1.27mm double row")
   (attr smd)
   (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value PinHeader_2x02_P1.27mm_Vertical_SMD (at 0 2.33) (layer F.Fab)
+  (fp_text value PinHeader_2x02 (at 0 2.33) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 4.3 -1.8) (end -4.3 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.3 1.8) (end 4.3 -1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.3 1.8) (end 4.3 1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.3 -1.8) (end -4.3 1.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.765 1.265) (end 1.765 1.33) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 1.265) (end -1.765 1.33) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.765 -1.33) (end 1.765 -1.265) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 -1.33) (end -1.765 -1.265) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.09 -1.265) (end -1.765 -1.265) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 1.33) (end 1.765 1.33) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 -1.33) (end 1.765 -1.33) (layer F.SilkS) (width 0.12))
-  (fp_line (start 2.75 0.835) (end 1.705 0.835) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 0.435) (end 2.75 0.835) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 0.435) (end 2.75 0.435) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 0.835) (end -1.705 0.835) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 0.435) (end -2.75 0.835) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 0.435) (end -2.75 0.435) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 -0.435) (end 1.705 -0.435) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 -0.835) (end 2.75 -0.435) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 -0.835) (end 2.75 -0.835) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 -0.435) (end -1.705 -0.435) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 -0.835) (end -2.75 -0.435) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 -0.835) (end -2.75 -0.835) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 -1.27) (end 1.705 1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 -0.835) (end -1.27 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 1.27) (end -1.705 -0.835) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 1.705 -1.27) (layer F.Fab) (width 0.1))
   (fp_line (start 1.705 1.27) (end -1.705 1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -1.27) (end 1.705 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 1.27) (end -1.705 -0.835) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 -0.835) (end -1.27 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 -1.27) (end 1.705 1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 -0.835) (end -2.75 -0.835) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 -0.835) (end -2.75 -0.435) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 -0.435) (end -1.705 -0.435) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 -0.835) (end 2.75 -0.835) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 -0.835) (end 2.75 -0.435) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 -0.435) (end 1.705 -0.435) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 0.435) (end -2.75 0.435) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 0.435) (end -2.75 0.835) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 0.835) (end -1.705 0.835) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 0.435) (end 2.75 0.435) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 0.435) (end 2.75 0.835) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 0.835) (end 1.705 0.835) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.765 -1.33) (end 1.765 -1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.765 1.33) (end 1.765 1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.09 -1.265) (end -1.765 -1.265) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.765 -1.33) (end -1.765 -1.265) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.765 -1.33) (end 1.765 -1.265) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.765 1.265) (end -1.765 1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.765 1.265) (end 1.765 1.33) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.3 -1.8) (end -4.3 1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -4.3 1.8) (end 4.3 1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 4.3 1.8) (end 4.3 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 4.3 -1.8) (end -4.3 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_text user %R (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/PinHeader_2x05_P1.27mm_Vertical_SMD.kicad_mod b/fab.pretty/PinHeader_2x05_P1.27mm_Vertical_SMD.kicad_mod
index d50a2d0..528e51f 100644
--- a/fab.pretty/PinHeader_2x05_P1.27mm_Vertical_SMD.kicad_mod
+++ b/fab.pretty/PinHeader_2x05_P1.27mm_Vertical_SMD.kicad_mod
@@ -1,59 +1,59 @@
-(module PinHeader_2x05_P1.27mm_Vertical_SMD (layer F.Cu) (tedit 59FED6E3)
+(module PinHeader_2x05_P1.27mm_Vertical_SMD (layer F.Cu) (tedit 60851B62)
   (descr "surface-mounted straight pin header, 2x05, 1.27mm pitch, double rows")
   (tags "Surface mounted pin header SMD 2x05 1.27mm double row")
   (attr smd)
   (fp_text reference REF** (at 0 -4.235) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value PinHeader_2x05_P1.27mm_Vertical_SMD (at 0 4.235) (layer F.Fab)
+  (fp_text value PinHeader_2x05 (at 0 4.235) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 4.3 -3.7) (end -4.3 -3.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.3 3.7) (end 4.3 -3.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.3 3.7) (end 4.3 3.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -4.3 -3.7) (end -4.3 3.7) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 1.765 3.17) (end 1.765 3.235) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 3.17) (end -1.765 3.235) (layer F.SilkS) (width 0.12))
-  (fp_line (start 1.765 -3.235) (end 1.765 -3.17) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 -3.235) (end -1.765 -3.17) (layer F.SilkS) (width 0.12))
-  (fp_line (start -3.09 -3.17) (end -1.765 -3.17) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 3.235) (end 1.765 3.235) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.765 -3.235) (end 1.765 -3.235) (layer F.SilkS) (width 0.12))
-  (fp_line (start 2.75 2.74) (end 1.705 2.74) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 2.34) (end 2.75 2.74) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 2.34) (end 2.75 2.34) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 2.74) (end -1.705 2.74) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 2.34) (end -2.75 2.74) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 2.34) (end -2.75 2.34) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 1.47) (end 1.705 1.47) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 1.07) (end 2.75 1.47) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 1.07) (end 2.75 1.07) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 1.47) (end -1.705 1.47) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 1.07) (end -2.75 1.47) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 1.07) (end -2.75 1.07) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 0.2) (end 1.705 0.2) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 -0.2) (end 2.75 0.2) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 -0.2) (end 2.75 -0.2) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 0.2) (end -1.705 0.2) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 -0.2) (end -2.75 0.2) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 -0.2) (end -2.75 -0.2) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 -1.07) (end 1.705 -1.07) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 -1.47) (end 2.75 -1.07) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 -1.47) (end 2.75 -1.47) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 -1.07) (end -1.705 -1.07) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 -1.47) (end -2.75 -1.07) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 -1.47) (end -2.75 -1.47) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 -2.34) (end 1.705 -2.34) (layer F.Fab) (width 0.1))
-  (fp_line (start 2.75 -2.74) (end 2.75 -2.34) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 -2.74) (end 2.75 -2.74) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 -2.34) (end -1.705 -2.34) (layer F.Fab) (width 0.1))
-  (fp_line (start -2.75 -2.74) (end -2.75 -2.34) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 -2.74) (end -2.75 -2.74) (layer F.Fab) (width 0.1))
-  (fp_line (start 1.705 -3.175) (end 1.705 3.175) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 -2.74) (end -1.27 -3.175) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.705 3.175) (end -1.705 -2.74) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -3.175) (end 1.705 -3.175) (layer F.Fab) (width 0.1))
   (fp_line (start 1.705 3.175) (end -1.705 3.175) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.27 -3.175) (end 1.705 -3.175) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 3.175) (end -1.705 -2.74) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 -2.74) (end -1.27 -3.175) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 -3.175) (end 1.705 3.175) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 -2.74) (end -2.75 -2.74) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 -2.74) (end -2.75 -2.34) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 -2.34) (end -1.705 -2.34) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 -2.74) (end 2.75 -2.74) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 -2.74) (end 2.75 -2.34) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 -2.34) (end 1.705 -2.34) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 -1.47) (end -2.75 -1.47) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 -1.47) (end -2.75 -1.07) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 -1.07) (end -1.705 -1.07) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 -1.47) (end 2.75 -1.47) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 -1.47) (end 2.75 -1.07) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 -1.07) (end 1.705 -1.07) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 -0.2) (end -2.75 -0.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 -0.2) (end -2.75 0.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 0.2) (end -1.705 0.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 -0.2) (end 2.75 -0.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 -0.2) (end 2.75 0.2) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 0.2) (end 1.705 0.2) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 1.07) (end -2.75 1.07) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 1.07) (end -2.75 1.47) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 1.47) (end -1.705 1.47) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 1.07) (end 2.75 1.07) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 1.07) (end 2.75 1.47) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 1.47) (end 1.705 1.47) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.705 2.34) (end -2.75 2.34) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 2.34) (end -2.75 2.74) (layer F.Fab) (width 0.1))
+  (fp_line (start -2.75 2.74) (end -1.705 2.74) (layer F.Fab) (width 0.1))
+  (fp_line (start 1.705 2.34) (end 2.75 2.34) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 2.34) (end 2.75 2.74) (layer F.Fab) (width 0.1))
+  (fp_line (start 2.75 2.74) (end 1.705 2.74) (layer F.Fab) (width 0.1))
+  (fp_line (start -1.765 -3.235) (end 1.765 -3.235) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.765 3.235) (end 1.765 3.235) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.09 -3.17) (end -1.765 -3.17) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.765 -3.235) (end -1.765 -3.17) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.765 -3.235) (end 1.765 -3.17) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.765 3.17) (end -1.765 3.235) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.765 3.17) (end 1.765 3.235) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.3 -3.7) (end -4.3 3.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -4.3 3.7) (end 4.3 3.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 4.3 3.7) (end 4.3 -3.7) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 4.3 -3.7) (end -4.3 -3.7) (layer F.CrtYd) (width 0.05))
   (fp_text user %R (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/Header_SMD_FTDI_01x06_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_FTDI_01x06_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 96%
rename from fab.pretty/Header_SMD_FTDI_01x06_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_FTDI_01x06_P2.54mm_Horizontal_SMD.kicad_mod
index 4e95ea9..34229c8 100644
--- a/fab.pretty/Header_SMD_FTDI_01x06_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_FTDI_01x06_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,50 +1,50 @@
-(module Header_SMD_FTDI_01x06_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFD952E)
+(module PinHeader_FTDI_01x06_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851AE4)
   (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_FTDI_01x06_P2.54mm_Horizontal_Male (at 2.286 15.621) (layer F.Fab)
+  (fp_text value PinHeader_FTDI_01x06 (at 2.286 15.621) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 13.97) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 13.97) (end 3.81 13.97) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 13.97) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 13.97) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 13.97) (end 6.35 13.97) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 13.97) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 14.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 14.5) (end 6.4 14.5) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 14.5) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 14.5) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 14.5) (end 6.4 14.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 14.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.8 13.97) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 13.97) (end 6.35 13.97) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 13.97) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 5.08) (end -0.635 5.08) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 7.62) (end -0.635 7.62) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 10.16) (end -0.635 10.16) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 12.7) (end -0.635 12.7) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 13.97) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 13.97) (end 3.81 13.97) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 13.97) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 4.826) (end 1.27 4.826) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 5.334) (end 1.27 5.334) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.366) (end 1.27 7.366) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 7.874) (end 1.27 7.874) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 9.906) (end 1.27 9.906) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 10.414) (end 1.27 10.414) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.446) (end 1.27 12.446) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 12.954) (end 1.27 12.954) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 4.826) (end -0.635 5.334) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 7.366) (end -0.635 7.874) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 9.906) (end -0.635 10.414) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 12.446) (end -0.635 12.954) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.6 6.1 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/fab.pretty/Header_SMD_UPDI_01x02_P2.54mm_Horizontal_Male.kicad_mod b/fab.pretty/PinHeader_UPDI_01x02_P2.54mm_Horizontal_SMD.kicad_mod
similarity index 93%
rename from fab.pretty/Header_SMD_UPDI_01x02_P2.54mm_Horizontal_Male.kicad_mod
rename to fab.pretty/PinHeader_UPDI_01x02_P2.54mm_Horizontal_SMD.kicad_mod
index fde21eb..a718490 100644
--- a/fab.pretty/Header_SMD_UPDI_01x02_P2.54mm_Horizontal_Male.kicad_mod
+++ b/fab.pretty/PinHeader_UPDI_01x02_P2.54mm_Horizontal_SMD.kicad_mod
@@ -1,34 +1,34 @@
-(module Header_SMD_UPDI_01x02_P2.54mm_Horizontal_Male (layer F.Cu) (tedit 5FFD954C)
+(module PinHeader_UPDI_01x02_P2.54mm_Horizontal_SMD (layer F.Cu) (tedit 60851B04)
   (descr https://s3.amazonaws.com/catalogspreads-pdf/PAGE112-113%20.100%20MALE%20HDR.pdf)
   (tags "horizontal pin header SMD 2.54mm")
   (attr smd)
   (fp_text reference REF** (at -1.524 -2.54 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)) (justify left))
   )
-  (fp_text value Header_SMD_UPDI_01x02_P2.54mm_Horizontal_Male (at 2.1 5.4) (layer F.Fab)
+  (fp_text value PinHeader_UPDI_01x02 (at 2.1 5.4) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
-  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 3.81) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 6.35 -1.27) (end 6.35 3.81) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
-  (fp_line (start 6.34 -1.27) (end 6.35 3.81) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 3.81) (end 6.35 3.81) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start 3.81 3.81) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
-  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
-  (fp_line (start -1.8 -1.8) (end -1.8 4.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -1.8 4.3) (end 6.4 4.3) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 6.4 4.3) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 6.4 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 6.4 4.3) (end 6.4 -1.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 4.3) (end 6.4 4.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.8 -1.8) (end -1.8 4.3) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.27 -1.27) (end 0 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 3.81) (end 3.8 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 -1.27) (end 6.34 -1.27) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.8 3.81) (end 6.35 3.81) (layer F.Fab) (width 0.1))
+  (fp_line (start 6.34 -1.27) (end 6.35 3.81) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 0) (end -0.635 0) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 2.54) (end -0.635 2.54) (layer F.Fab) (width 0.1))
+  (fp_line (start 3.81 -1.27) (end 6.35 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 -1.27) (end 6.35 3.81) (layer F.SilkS) (width 0.12))
+  (fp_line (start 6.35 3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 3.81) (end 3.81 -1.27) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 -0.254) (end 1.27 -0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 0.254) (end 1.27 0.254) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.286) (end 1.27 2.286) (layer F.SilkS) (width 0.12))
+  (fp_line (start 3.81 2.794) (end 1.27 2.794) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.635 -0.254) (end -0.635 0.254) (layer F.Fab) (width 0.1))
+  (fp_line (start -0.635 2.286) (end -0.635 2.794) (layer F.Fab) (width 0.1))
   (fp_text user %R (at 2.54 1.27 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-- 
GitLab