diff --git a/common.pretty/C0402.kicad_mod b/common.pretty/C0402.kicad_mod
index e645dc5..73b7950 100644
--- a/common.pretty/C0402.kicad_mod
+++ b/common.pretty/C0402.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "C0402" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEDF5C)
+  (tedit 60CF06EB)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.143) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -0.51 0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp 81d231b7-0194-4d7c-8b00-1c7c08ea4a25))
   (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 518cf349-2508-4345-83d0-77dbaf0298af))
   (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b772a42d-7d91-4e96-9b3b-738f1ace5f2b))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/C0402.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0402.step"
     (offset (xyz 0 0 0.2539999962))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/C0402_NOSILK.kicad_mod b/common.pretty/C0402_NOSILK.kicad_mod
index b0d950c..a924e96 100644
--- a/common.pretty/C0402_NOSILK.kicad_mod
+++ b/common.pretty/C0402_NOSILK.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "C0402_NOSILK" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEDF95)
+  (tedit 60CF06F2)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.143) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start 0.51 -0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp e307dc91-7aa8-42b2-b4a6-d4760bbfc0de))
   (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6bd726b6-475a-4c1e-a27b-c799f8a18814))
   (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 40d40f27-654d-4705-b46e-13cc97dba4fa))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/C0402.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0402.step"
     (offset (xyz 0 0 0.2539999962))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/C0603.kicad_mod b/common.pretty/C0603.kicad_mod
index 9fea16c..bbbda0d 100644
--- a/common.pretty/C0603.kicad_mod
+++ b/common.pretty/C0603.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "C0603" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE2F8)
+  (tedit 60CF06F9)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.27) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -0.85 -0.45) (end 0.85 -0.45) (layer "F.Fab") (width 0.127) (tstamp e6779a46-cae4-40a6-88c0-5eb7723de3d0))
   (pad "1" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ea3d1910-ba90-4193-8bcb-e759bd6a143b))
   (pad "2" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ed2c1cee-018a-4d5c-8c70-0267306f1023))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/C0603.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0603.step"
     (offset (xyz 0 0 0.3809999943))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/C0805.kicad_mod b/common.pretty/C0805.kicad_mod
index cff7e3c..11dfad8 100644
--- a/common.pretty/C0805.kicad_mod
+++ b/common.pretty/C0805.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "C0805" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE346)
+  (tedit 60CF0701)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.651) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -1 0.625) (end 1 0.625) (layer "F.Fab") (width 0.127) (tstamp dc58328a-ba7d-42e8-9f91-0fe369bd8c98))
   (pad "1" smd rect (at -0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4bae7519-0d9f-4751-b8c3-0cdeb7ce85ad))
   (pad "2" smd rect (at 0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp dfb0fa00-f2f0-447e-a27c-1978f4540796))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/C0805.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0805.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/C1206.kicad_mod b/common.pretty/C1206.kicad_mod
index 25b2787..2024ac6 100644
--- a/common.pretty/C1206.kicad_mod
+++ b/common.pretty/C1206.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "C1206" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE3C7)
+  (tedit 60CF0708)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.778) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -1.524 -0.762) (end -1.524 0.762) (layer "F.Fab") (width 0.127) (tstamp ac725cc8-a89d-4d54-a8a1-fb14c5e105c0))
   (pad "1" smd rect (at -1.4478 0) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b787552f-93de-4bac-b94d-b6fedc5b64f2))
   (pad "2" smd rect (at 1.4478 0 180) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 43d8339c-a9a8-4fad-8645-85ee799734e2))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/C1206.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C1206.step"
     (offset (xyz 0 0 0.8636))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/C1210.kicad_mod b/common.pretty/C1210.kicad_mod
index 18dc7e6..74db699 100644
--- a/common.pretty/C1210.kicad_mod
+++ b/common.pretty/C1210.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "C1210" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE3E1)
+  (tedit 60CF070E)
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.286) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -1.524 -1.27) (end 1.524 -1.27) (layer "F.Fab") (width 0.127) (tstamp f6a2ab07-bc30-48cf-8b00-2d4c6bc8b88f))
   (pad "1" smd rect (at -1.397 0) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a44e2f8a-cb1c-4e92-a1a2-27607afdecde))
   (pad "2" smd rect (at 1.397 0 180) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bf7a22dd-4a0f-4670-8ef4-c78f050ad406))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/C1210.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C1210.step"
     (offset (xyz 0 0 0.4064))
     (scale (xyz 1 1 1))
     (rotate (xyz 90 0 0))
diff --git a/common.pretty/CK_1101M2S3CQE2.kicad_mod b/common.pretty/CK_1101M2S3CQE2.kicad_mod
index 87a7b27..008be92 100644
--- a/common.pretty/CK_1101M2S3CQE2.kicad_mod
+++ b/common.pretty/CK_1101M2S3CQE2.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "CK_1101M2S3CQE2" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE750)
+  (tedit 60CF071D)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -7.62) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -42,7 +42,7 @@
   (pad "1" thru_hole circle (at 0 -4.699) (size 3.302 3.302) (drill 1.8542) (layers *.Cu *.Mask) (tstamp 3c31662f-1953-4aec-b370-ae0694154760))
   (pad "2" thru_hole circle (at 0 0) (size 3.302 3.302) (drill 1.8542) (layers *.Cu *.Mask) (tstamp cea26aaa-4642-4646-95f8-82b3df42d58a))
   (pad "3" thru_hole circle (at 0 4.699) (size 3.302 3.302) (drill 1.8542) (layers *.Cu *.Mask) (tstamp b71cd586-da5c-43f3-b13f-70d35d3f9d2b))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/1101M2S3CQE2.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/CK_1101M2S3CQE2.step"
     (offset (xyz 0 0 2.032))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 -90))
diff --git a/common.pretty/CK_T101MH9AQE.kicad_mod b/common.pretty/CK_T101MH9AQE.kicad_mod
index 5d03b6d..0eb6176 100644
--- a/common.pretty/CK_T101MH9AQE.kicad_mod
+++ b/common.pretty/CK_T101MH9AQE.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "CK_T101MH9AQE" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE71C)
+  (tedit 60CF0728)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 6.731) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -33,7 +33,7 @@
   (pad "1" thru_hole circle (at -2.54 5.08) (size 2 2) (drill 1.09) (layers *.Cu *.Mask) (tstamp d34aefeb-782c-4bcd-9e96-926a7deb1cfd))
   (pad "2" thru_hole circle (at 0 5.08) (size 2 2) (drill 1.09) (layers *.Cu *.Mask) (tstamp c472c258-ff91-4b2d-83de-32da048d4a68))
   (pad "3" thru_hole circle (at 2.54 5.08) (size 2 2) (drill 1.09) (layers *.Cu *.Mask) (tstamp fbac3085-f86d-47c3-964e-634abd39b5aa))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/T101MH9AQE.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/CK_T101MH9AQE.step"
     (offset (xyz 0 -2.286 3.048))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 180 0))
diff --git a/common.pretty/CONN_SuperSMA_Amphenol_901-10510-2.kicad_mod b/common.pretty/CONN_SuperSMA_Amphenol_901-10510-2.kicad_mod
index f49d722..ef239b2 100644
--- a/common.pretty/CONN_SuperSMA_Amphenol_901-10510-2.kicad_mod
+++ b/common.pretty/CONN_SuperSMA_Amphenol_901-10510-2.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "CONN_SuperSMA_Amphenol_901-10510-2" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE6FD)
+  (tedit 60CF0738)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 6.35) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -31,7 +31,7 @@
   (pad "0" thru_hole rect (at -1.2192 1.7526) (size 1.27 1.27) (drill 1.143) (layers *.Cu *.Mask) (tstamp eef9f349-602d-4c47-b294-96e24f59c6a2))
   (pad "0" thru_hole rect (at -4.7625 2.794) (size 3.81 5.842) (drill 1.9812) (layers *.Cu *.Mask) (tstamp fa71cc52-3a00-4d52-9460-3e6ae030d8d9))
   (pad "1" smd rect (at 0 0.635) (size 0.254 1.524) (layers "F.Cu" "F.Mask") (tstamp 8b2267dc-4c85-4d03-bbc4-1ea3f80ad33d))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/SuperSMA.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Southwest_SuperSMA.step"
     (offset (xyz 0 4.2291 0.127))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 180))
diff --git a/common.pretty/CRYSTAL_Abracon_ABM10AIG.kicad_mod b/common.pretty/CRYSTAL_Abracon_ABM10AIG.kicad_mod
index d2b4f12..3af7e86 100644
--- a/common.pretty/CRYSTAL_Abracon_ABM10AIG.kicad_mod
+++ b/common.pretty/CRYSTAL_Abracon_ABM10AIG.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "CRYSTAL_Abracon_ABM10AIG" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE6D3)
+  (tedit 60CF075C)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.905) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -25,9 +25,4 @@
   (pad "0" smd rect (at 0.825 0.65) (size 0.95 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6b778577-1ef6-4827-8d11-413c7aa59b76))
   (pad "1" smd rect (at -0.825 0.65) (size 0.95 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ab938aeb-1b50-43a6-b0e2-fb4a67761cdd))
   (pad "2" smd rect (at 0.825 -0.65) (size 0.95 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b9b3f2d1-1a6a-4506-9467-7b7cda43ed5b))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/User Library-Crystal NDK NX2520SA series.step"
-    (offset (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
 )
diff --git a/common.pretty/Coilcraft_ETH1-460L.kicad_mod b/common.pretty/Coilcraft_ETH1-460L.kicad_mod
index 820c690..04641a9 100644
--- a/common.pretty/Coilcraft_ETH1-460L.kicad_mod
+++ b/common.pretty/Coilcraft_ETH1-460L.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_ETH1-460L" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE6AC)
+  (tedit 60CF077C)
   (attr smd)
   (fp_text reference "REF**" (at 0 -10.287 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -27,6 +27,9 @@
   (fp_line (start -8.255 -9.2964) (end 8.255 -9.2964) (layer "F.Fab") (width 0.127) (tstamp 45d9a94a-1d12-4efa-ae80-dc5c3e977d05))
   (fp_line (start -8.255 -9.2964) (end -8.255 9.2964) (layer "F.Fab") (width 0.127) (tstamp 6c391386-2bc6-4d17-ab8b-7b7f654c9498))
   (fp_line (start 8.255 9.2964) (end 8.255 -9.2964) (layer "F.Fab") (width 0.127) (tstamp 6e114e05-c8fd-4024-8beb-1fad20081ae4))
+  (fp_poly (pts (xy -8.255 -6.7564)
+    (xy -8.255 -9.2964)
+    (xy -5.715 -9.2964)) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 45c77ef1-e7c6-47a0-b8ea-f314a629442b))
   (pad "1" smd rect (at -7.7597 -6.985) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bc11acc3-eed8-4735-a6d7-4ca0892eb108))
   (pad "2" smd rect (at -7.7597 -5.715) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cf790e41-b066-4641-b005-ff7d7f1669bb))
   (pad "3" smd rect (at -7.7597 -4.445) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 5a4c11f7-052a-40db-9040-afb48a7e79fe))
@@ -51,7 +54,7 @@
   (pad "22" smd rect (at 7.7597 -4.445) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 66a81dfb-5753-41e8-b6e7-19abe0df468b))
   (pad "23" smd rect (at 7.7597 -5.715) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 095cf05d-f59b-42dd-b662-f22bca498f51))
   (pad "24" smd rect (at 7.7597 -6.985) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c30b123d-c211-422e-baad-0ef95ca4a209))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_ETH1-460L.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_ETH1-460L.step"
     (offset (xyz 0 0 0.254))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 180))
diff --git a/common.pretty/Coilcraft_LPD5030.kicad_mod b/common.pretty/Coilcraft_LPD5030.kicad_mod
index b1fee5a..35a89b0 100644
--- a/common.pretty/Coilcraft_LPD5030.kicad_mod
+++ b/common.pretty/Coilcraft_LPD5030.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_LPD5030" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE675)
+  (tedit 60CF080E)
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.683) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -21,10 +21,21 @@
   (fp_line (start -3.048 -1.778) (end -1.778 -3.048) (layer "F.SilkS") (width 0.1778) (tstamp ca34be40-1693-4c10-a113-1d6ae0ae6d84))
   (fp_line (start 1.778 -3.048) (end 3.048 -1.778) (layer "F.SilkS") (width 0.1778) (tstamp fe1e60ba-e1ed-4e44-a820-4d12e46d1ecc))
   (fp_line (start 1.778 3.048) (end -1.778 3.048) (layer "F.SilkS") (width 0.1778) (tstamp fe8399ef-29d3-4fc0-a724-9808988624c1))
+  (fp_poly (pts (xy -0.762 -2.794)
+    (xy -1.778 -2.794)
+    (xy -2.794 -1.778)
+    (xy -2.794 -0.762)
+    (xy -3.048 -0.762)
+    (xy -3.048 -1.778)
+    (xy -1.778 -3.048)
+    (xy -0.762 -3.048)) (layer "F.SilkS") (width 0.1778) (fill solid) (tstamp 0359bd21-2fde-424a-a702-f14347c7aca5))
   (fp_line (start -2.4 -2.4) (end -2.4 2.4) (layer "F.Fab") (width 0.127) (tstamp 8da54753-959d-4947-99fc-bfda832dcb69))
   (fp_line (start 2.4 2.4) (end 2.4 -2.4) (layer "F.Fab") (width 0.127) (tstamp 8ea703b8-fa99-454c-a493-9c8578346324))
   (fp_line (start -2.4 2.4) (end 2.4 2.4) (layer "F.Fab") (width 0.127) (tstamp bfbd8a74-d457-40d7-b304-56b934085c4c))
   (fp_line (start 2.4 -2.4) (end -2.4 -2.4) (layer "F.Fab") (width 0.127) (tstamp d07c243c-84e3-4681-8685-ff32bde0a913))
+  (fp_poly (pts (xy -2.4 -1.638)
+    (xy -2.4 -2.4)
+    (xy -1.638 -2.4)) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 99ee4ca0-d975-4ada-a3f3-787ee79077d8))
   (pad "1" smd custom (at -1.7526 -1.7526) (size 0.762 0.762) (layers "F.Cu" "F.Paste" "F.Mask")
     (zone_connect 2)
     (options (clearance outline) (anchor circle))
@@ -85,9 +96,9 @@
         (xy 0 0.6096)
       ) (width 0) (fill yes))
     ) (tstamp ddd5d306-17c4-4d55-ac2b-6b4f773b7521))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_LPD5030.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPD5030.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
-    (rotate (xyz -90 0 0))
+    (rotate (xyz -90 0 90))
   )
 )
diff --git a/common.pretty/Coilcraft_LPS3015.kicad_mod b/common.pretty/Coilcraft_LPS3015.kicad_mod
index 0365979..bc4c142 100644
--- a/common.pretty/Coilcraft_LPS3015.kicad_mod
+++ b/common.pretty/Coilcraft_LPS3015.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_LPS3015" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE65C)
+  (tedit 60CF0817)
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.413) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -59,7 +59,7 @@
         (xy -0.381 1.27)
       ) (width 0) (fill yes))
     ) (tstamp 90685c2b-dfb9-4b8e-84b4-c3c2ac16e985))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_LPS3015.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPS3015.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Coilcraft_LPS5030.kicad_mod b/common.pretty/Coilcraft_LPS5030.kicad_mod
index 8f56d38..fc95ecc 100644
--- a/common.pretty/Coilcraft_LPS5030.kicad_mod
+++ b/common.pretty/Coilcraft_LPS5030.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_LPS5030" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE643)
+  (tedit 60CF0820)
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.683) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -59,7 +59,7 @@
         (xy -0.52705 1.7018)
       ) (width 0) (fill yes))
     ) (tstamp 3c8333ee-5d38-4a14-a0c6-11bad246bd27))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_LPS5030.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPS5030.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Coilcraft_LPS8045.kicad_mod b/common.pretty/Coilcraft_LPS8045.kicad_mod
index 9edcda8..d5f8c98 100644
--- a/common.pretty/Coilcraft_LPS8045.kicad_mod
+++ b/common.pretty/Coilcraft_LPS8045.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_LPS8045" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE62D)
+  (tedit 60CF0827)
   (attr smd)
   (fp_text reference "REF**" (at 0 -5.334 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -27,7 +27,7 @@
   (fp_line (start 3.302 4.0005) (end -3.302 4.0005) (layer "F.Fab") (width 0.127) (tstamp 8fd3e1fd-72f8-4954-b8b1-66cf8522289f))
   (pad "1" smd rect (at -2.6035 0 180) (size 3.4036 8.6106) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 76d4a675-aa44-40b4-99b5-fa6ca3dcca5a))
   (pad "2" smd rect (at 2.6035 0) (size 3.4036 8.6106) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d3258bbc-32b9-4c13-ae65-8aa5dbe3aa9d))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_LPS8045B.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPS8045B.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Coilcraft_XEL3520.kicad_mod b/common.pretty/Coilcraft_XEL3520.kicad_mod
index ae21780..960c56a 100644
--- a/common.pretty/Coilcraft_XEL3520.kicad_mod
+++ b/common.pretty/Coilcraft_XEL3520.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_XEL3520" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE5D9)
+  (tedit 60CF0835)
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -17,7 +17,7 @@
   (fp_rect (start -1.6002 -1.6002) (end 1.6002 1.6002) (layer "F.Fab") (width 0.127) (fill none) (tstamp 4e38c81b-e4e6-4539-aa6b-1d3f8902709b))
   (pad "1" smd rect (at -0.9 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 3077c384-967b-4120-acd5-0cb158a9bbab))
   (pad "2" smd rect (at 0.9 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ef35c798-0742-4778-99f0-1fe909e5a689))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_XEL3520.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL3520.step"
     (offset (xyz 0 0 0.0508))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Coilcraft_XEL5050_510.kicad_mod b/common.pretty/Coilcraft_XEL5050_510.kicad_mod
index f5faa78..86d40a0 100644
--- a/common.pretty/Coilcraft_XEL5050_510.kicad_mod
+++ b/common.pretty/Coilcraft_XEL5050_510.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_XEL5050_510" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE592)
+  (tedit 60CF083C)
   (descr "5.10mm Height")
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.683 unlocked) (layer "F.SilkS")
@@ -18,7 +18,7 @@
   (fp_rect (start -2.7432 -2.7432) (end 2.7432 2.7432) (layer "F.Fab") (width 0.127) (fill none) (tstamp 61f8f454-8fb3-4f4d-ad9e-c50bf3f909b8))
   (pad "1" smd rect (at -1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d5cfd21e-e123-40dd-8d7c-b5fd883ae51c))
   (pad "2" smd rect (at 1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 19f4f8bf-8b83-46bd-b42d-3d68404ca984))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_XEL5050_510.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL5050_510.step"
     (offset (xyz 0 0 0.0508))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Coilcraft_XEL5050_520.kicad_mod b/common.pretty/Coilcraft_XEL5050_520.kicad_mod
index 62bdf11..5eb90d2 100644
--- a/common.pretty/Coilcraft_XEL5050_520.kicad_mod
+++ b/common.pretty/Coilcraft_XEL5050_520.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_XEL5050_520" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE5AD)
+  (tedit 60CF0844)
   (descr "5.20mm Height")
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.683 unlocked) (layer "F.SilkS")
@@ -18,7 +18,7 @@
   (fp_rect (start -2.7432 -2.7432) (end 2.7432 2.7432) (layer "F.Fab") (width 0.127) (fill none) (tstamp 1c4c83ca-84a0-4224-8ade-e884beed1ef0))
   (pad "1" smd rect (at -1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c20f5a3f-fbcd-4ce9-b378-2b15c6e46a8a))
   (pad "2" smd rect (at 1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ef0a5636-43e1-4479-ba4d-c3842ce618da))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_XEL5050_520.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL5050_520.step"
     (offset (xyz 0 0 0.0508))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Coilcraft_XEL5050_530.kicad_mod b/common.pretty/Coilcraft_XEL5050_530.kicad_mod
index 7d2be23..ed7251b 100644
--- a/common.pretty/Coilcraft_XEL5050_530.kicad_mod
+++ b/common.pretty/Coilcraft_XEL5050_530.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Coilcraft_XEL5050_530" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE5C2)
+  (tedit 60CF084C)
   (descr "5.30mm Height")
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.683 unlocked) (layer "F.SilkS")
@@ -18,7 +18,7 @@
   (fp_rect (start -2.7432 -2.7432) (end 2.7432 2.7432) (layer "F.Fab") (width 0.127) (fill none) (tstamp a0ba0d99-63f8-4988-88d8-bd7ac2ce3831))
   (pad "1" smd rect (at -1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c8178636-ec90-4ac7-b9c0-715db5fc0aba))
   (pad "2" smd rect (at 1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 18d85cc0-19df-4a9c-a308-bb488346361a))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Coilcraft_XEL5050_520.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL5050_520.step"
     (offset (xyz 0 0 0.0508))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Conn_FFC_Molex_5051102291.kicad_mod b/common.pretty/Conn_FFC_Molex_5051102291.kicad_mod
index 439e5a0..1b0ca3f 100644
--- a/common.pretty/Conn_FFC_Molex_5051102291.kicad_mod
+++ b/common.pretty/Conn_FFC_Molex_5051102291.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "Conn_FFC_Molex_5051102291" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 6023341C)
+(footprint "Conn_FFC_Molex_5051102291" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF085C)
   (attr smd)
   (fp_text reference "REF**" (at 0 3.302 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -72,8 +72,8 @@
     (solder_mask_margin 0.0508) (tstamp b92305c6-ef9d-4346-a58a-50eb87c5faaf))
   (pad "22" smd rect (at -5.25 2.05 180) (size 0.3 1) (layers "F.Cu" "F.Paste" "F.Mask")
     (solder_mask_margin 0.0508) (tstamp e67953d7-1a3b-4ca8-9340-bb9e9856721b))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/5051102291.step"
-    (offset (xyz 0 -0.8890000000000001 0))
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Molex_5051102291.step"
+    (offset (xyz 0 -0.889 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 180))
   )
diff --git a/common.pretty/Conn_MicroMateNLok_2-1445088-2.kicad_mod b/common.pretty/Conn_MicroMateNLok_2-1445088-2.kicad_mod
index 43e1c42..ecc7a31 100644
--- a/common.pretty/Conn_MicroMateNLok_2-1445088-2.kicad_mod
+++ b/common.pretty/Conn_MicroMateNLok_2-1445088-2.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Conn_MicroMateNLok_2-1445088-2" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE7C3)
+  (tedit 60CF0870)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -5.842 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -22,7 +22,7 @@
   (pad "0" thru_hole circle (at -3.6463 0) (size 3.81 3.81) (drill 2.413) (layers *.Cu *.Mask) (tstamp 8fdf18e8-fe7b-42f1-96d5-c918ab6988a4))
   (pad "1" thru_hole circle (at -1.5 -4.318) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp 90378aaa-499e-425c-85fc-aa015160c512))
   (pad "1" thru_hole circle (at 1.5 -4.318) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp eb75b49c-50bf-4653-b93b-f3b837f1a1de))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/c-2-1445088-2-b-3d.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/TE_2-1445088-2.step"
     (offset (xyz 0 -4.6228 2.54))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Conn_MicroMateNLok_3-794679-2.kicad_mod b/common.pretty/Conn_MicroMateNLok_3-794679-2.kicad_mod
index bf82050..7156672 100644
--- a/common.pretty/Conn_MicroMateNLok_3-794679-2.kicad_mod
+++ b/common.pretty/Conn_MicroMateNLok_3-794679-2.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Conn_MicroMateNLok_3-794679-2" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE7B7)
+  (tedit 60CF087C)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -9.271 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -22,7 +22,7 @@
   (pad "0" thru_hole circle (at -2.1463 0) (size 3.81 3.81) (drill 2.413) (layers *.Cu *.Mask) (tstamp e4beff0b-2afb-493f-90ff-6daf2e471945))
   (pad "1" thru_hole circle (at 0 -7.3152) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp 2784b6c3-eb1f-4de2-8696-e580583bfd09))
   (pad "1" thru_hole circle (at 0 -4.318) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp f978b2ac-083b-42ed-af6b-533b094e9ba4))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/c-3-794679-2-j-3d.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/TE_3-794679-2.step"
     (offset (xyz 0 -4.6228 4.064))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/D0402.kicad_mod b/common.pretty/D0402.kicad_mod
index 1d20ed1..2792068 100644
--- a/common.pretty/D0402.kicad_mod
+++ b/common.pretty/D0402.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "D0402" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE568)
+  (tedit 60CF0885)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.143) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -28,7 +28,7 @@
   (fp_line (start -0.51 0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp f9bdfb04-d0a2-43e8-8f3b-8072523e76c4))
   (pad "A" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6732d11c-6504-481e-96a6-13b2dfc9d7a8))
   (pad "K" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 7573cb6d-4c92-47ce-a021-184eb01e2523))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R0402.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0402.step"
     (offset (xyz 0 0 0.1269999981))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/D0603.kicad_mod b/common.pretty/D0603.kicad_mod
index 297667c..d67c63f 100644
--- a/common.pretty/D0603.kicad_mod
+++ b/common.pretty/D0603.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "D0603" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE357)
+  (tedit 60CF08EA)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.27) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -26,4 +26,9 @@
   (fp_line (start 0.85 -0.45) (end 0.85 0.45) (layer "F.Fab") (width 0.127) (tstamp d0522247-6f03-42fc-b25e-51f6172c276a))
   (pad "A" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 81f64bdc-df6b-453e-9119-08af6b7836e7))
   (pad "K" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 513ca97f-77af-4603-b3df-e64fefc9fd22))
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0603.step"
+    (offset (xyz 0 0 0.2032))
+    (scale (xyz 1 1 1))
+    (rotate (xyz -90 0 0))
+  )
 )
diff --git a/common.pretty/DF40HC(3.0)-100DS-0.4V(58).kicad_mod b/common.pretty/DF40HC(3.0)-100DS-0.4V(58).kicad_mod
index c4c2aa7..da2fe70 100644
--- a/common.pretty/DF40HC(3.0)-100DS-0.4V(58).kicad_mod
+++ b/common.pretty/DF40HC(3.0)-100DS-0.4V(58).kicad_mod
@@ -1,5 +1,5 @@
-(footprint "DF40HC(3.0)-100DS-0.4V(58)" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 6023401B)
+(footprint "DF40HC(3.0)-100DS-0.4V(58)" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF0908)
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -120,7 +120,7 @@
   (pad "98" smd rect (at 9.4 -1.54) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bec3e531-a4ad-4de1-8b69-7f7e6068e3d1))
   (pad "99" smd rect (at 9.8 1.54) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ab949255-b7d2-4783-9451-4ddbda80e5d9))
   (pad "100" smd rect (at 9.8 -1.54) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp dfd4084a-b982-48e4-b503-4bc4565b6c00))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/DF40HC(3.0)-100DS-0.4V.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Hirose_DF40HC(3.0)-100DS-0.4V.step"
     (offset (xyz 0 0 1.524))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 90))
diff --git a/common.pretty/DO-214AC.kicad_mod b/common.pretty/DO-214AC.kicad_mod
index 0aa68d9..6bb91c2 100644
--- a/common.pretty/DO-214AC.kicad_mod
+++ b/common.pretty/DO-214AC.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "DO-214AC" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 602333BD)
+(footprint "DO-214AC" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF0922)
   (descr "Diode SMA")
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.413 unlocked) (layer "F.SilkS")
@@ -30,7 +30,7 @@
   (fp_rect (start -2.2987 -1.397) (end -1.27 1.397) (layer "F.Fab") (width 0.127) (fill none) (tstamp a7183208-16d3-403c-9e81-2940f4628fbe))
   (pad "A" smd rect (at 2.1844 0) (size 2.0828 1.778) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bcb8e491-6b86-4a91-b04e-eab57e613186))
   (pad "K" smd rect (at -2.1844 0) (size 2.0828 1.778) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8fdc91f3-6a7e-48e5-9fe9-daf96fdb4515))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/DO-214AC.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/DO-214AC.step"
     (offset (xyz 0 0 1.397))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 -90))
diff --git a/common.pretty/Deltron_571-0100_Black.kicad_mod b/common.pretty/Deltron_571-0100_Black.kicad_mod
index 930b828..b0445c3 100644
--- a/common.pretty/Deltron_571-0100_Black.kicad_mod
+++ b/common.pretty/Deltron_571-0100_Black.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Deltron_571-0100_Black" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE14C)
+  (tedit 60CF092B)
   (attr through_hole)
   (fp_text reference "REF**" (at -19.685 0 90 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -34,7 +34,7 @@
   (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
   (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Deltron_571-0100.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0100.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 -90))
diff --git a/common.pretty/Deltron_571-0200_Blue.kicad_mod b/common.pretty/Deltron_571-0200_Blue.kicad_mod
index f3eee0b..9ab668a 100644
--- a/common.pretty/Deltron_571-0200_Blue.kicad_mod
+++ b/common.pretty/Deltron_571-0200_Blue.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Deltron_571-0200_Blue" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE155)
+  (tedit 60CF0932)
   (attr through_hole)
   (fp_text reference "REF**" (at -19.685 0 90 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -34,7 +34,7 @@
   (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
   (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Deltron_571-0200.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0200.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 -90))
diff --git a/common.pretty/Deltron_571-0300_Brown.kicad_mod b/common.pretty/Deltron_571-0300_Brown.kicad_mod
index fd4ba4a..494bb05 100644
--- a/common.pretty/Deltron_571-0300_Brown.kicad_mod
+++ b/common.pretty/Deltron_571-0300_Brown.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Deltron_571-0300_Brown" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE15D)
+  (tedit 60CF0939)
   (attr through_hole)
   (fp_text reference "REF**" (at -19.685 0 90 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -34,7 +34,7 @@
   (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
   (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Deltron_571-0300.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0300.step"
     (offset (xyz -18.6944 -4.8514 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Deltron_571-0400_Green.kicad_mod b/common.pretty/Deltron_571-0400_Green.kicad_mod
index d18ca54..1b56d4e 100644
--- a/common.pretty/Deltron_571-0400_Green.kicad_mod
+++ b/common.pretty/Deltron_571-0400_Green.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Deltron_571-0400_Green" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE167)
+  (tedit 60CF0947)
   (attr through_hole)
   (fp_text reference "REF**" (at -19.685 0 90 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -34,7 +34,7 @@
   (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
   (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Deltron_571-0400.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0400.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 -90))
diff --git a/common.pretty/Deltron_571-0500_Red.kicad_mod b/common.pretty/Deltron_571-0500_Red.kicad_mod
index e55fd18..ca025a7 100644
--- a/common.pretty/Deltron_571-0500_Red.kicad_mod
+++ b/common.pretty/Deltron_571-0500_Red.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Deltron_571-0500_Red" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE16F)
+  (tedit 60CF094E)
   (attr through_hole)
   (fp_text reference "REF**" (at -19.685 0 90 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -34,7 +34,7 @@
   (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
   (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Deltron_571-0500.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0500.step"
     (offset (xyz -18.6944 -4.8514 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Deltron_571-0600_White.kicad_mod b/common.pretty/Deltron_571-0600_White.kicad_mod
index 8e287e7..91c5d61 100644
--- a/common.pretty/Deltron_571-0600_White.kicad_mod
+++ b/common.pretty/Deltron_571-0600_White.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Deltron_571-0600_White" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE177)
+  (tedit 60CF0955)
   (attr through_hole)
   (fp_text reference "REF**" (at -19.685 0 90 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -34,7 +34,7 @@
   (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
   (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Deltron_571-0600.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0600.step"
     (offset (xyz -18.6944 -4.8514 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Deltron_571-0700_Yellow.kicad_mod b/common.pretty/Deltron_571-0700_Yellow.kicad_mod
index d5f5f51..466dfc5 100644
--- a/common.pretty/Deltron_571-0700_Yellow.kicad_mod
+++ b/common.pretty/Deltron_571-0700_Yellow.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Deltron_571-0700_Yellow" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE17E)
+  (tedit 60CF095C)
   (attr through_hole)
   (fp_text reference "REF**" (at -19.685 0 90 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -34,7 +34,7 @@
   (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
   (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Deltron_571-0700.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0700.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 -90))
diff --git a/common.pretty/EVP-AEDB2A.kicad_mod b/common.pretty/EVP-AEDB2A.kicad_mod
index e985419..cffdbf4 100644
--- a/common.pretty/EVP-AEDB2A.kicad_mod
+++ b/common.pretty/EVP-AEDB2A.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "EVP-AEDB2A" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE1A4)
+  (tedit 60CF0980)
   (descr "Switch SPST Tactile, Edge Mount, SMD")
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.556 unlocked) (layer "F.SilkS")
@@ -31,7 +31,7 @@
   (pad "1" smd rect (at -1.15 -2.375) (size 0.8 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 708da6fd-0448-49b7-b081-3c0d9c8986a9))
   (pad "1" smd rect (at 1.15 -2.375) (size 0.8 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c17b22f3-fe9b-40ed-bdf8-8136a5a056a9))
   (pad "2" smd rect (at 0 -2.375) (size 0.8 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 3484dae1-2bac-470c-a354-94caa1cf23e5))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/EVPAEBB2A.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Panasonic_EVP-AEBB2A.step"
     (offset (xyz 0 1.397 -0.6096))
     (scale (xyz 1 1 1))
     (rotate (xyz 180 0 0))
diff --git a/common.pretty/HSEC8-120-01-L-DV-A-WT-TR.kicad_mod b/common.pretty/HSEC8-120-01-L-DV-A-WT-TR.kicad_mod
index 1b00730..2a64741 100644
--- a/common.pretty/HSEC8-120-01-L-DV-A-WT-TR.kicad_mod
+++ b/common.pretty/HSEC8-120-01-L-DV-A-WT-TR.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "HSEC8-120-01-L-DV-A-WT-TR" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 602333A9)
+(footprint "HSEC8-120-01-L-DV-A-WT-TR" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF099F)
   (attr smd)
   (fp_text reference "REF**" (at 0 -4.699) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -62,7 +62,7 @@
   (pad "38" smd rect (at 6.8 -1.7) (size 0.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 19dddb2a-71a7-40d3-ae86-8d4a037ea719))
   (pad "39" smd rect (at 7.6 1.7) (size 0.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp fe6b7586-8708-463a-88db-4af98595b617))
   (pad "40" smd rect (at 7.6 -1.7) (size 0.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e79f1b25-97e8-49c0-aed8-cfd632eb9105))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/HSEC8-120-01-L-DV-A-WT.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_HSEC8-120-01-L-DV-A-WT.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/HSEC8-120-01-L-RA.kicad_mod b/common.pretty/HSEC8-120-01-L-RA.kicad_mod
index e55fe2d..e7071d4 100644
--- a/common.pretty/HSEC8-120-01-L-RA.kicad_mod
+++ b/common.pretty/HSEC8-120-01-L-RA.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "HSEC8-120-01-L-RA" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 602333A3)
+(footprint "HSEC8-120-01-L-RA" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF09AB)
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.413) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -68,7 +68,7 @@
   (pad "38" smd rect (at 6.8 -0.925) (size 0.5 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4fda990b-7c4d-4ff6-b437-b3125222506f))
   (pad "39" smd rect (at 7.6 1.075) (size 0.5 1.35) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1fb40c6d-64a3-49c9-a0bc-65c7a72fdaf7))
   (pad "40" smd rect (at 7.6 -0.925) (size 0.5 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cd87fa89-c71f-4cb0-a5d1-65623b0df230))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/HSEC8-120-01-L-RA.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_HSEC8-120-01-L-RA.step"
     (offset (xyz 0 -1.524 3.048))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_1043.kicad_mod b/common.pretty/Keystone_1043.kicad_mod
index 6660d90..e93d20b 100644
--- a/common.pretty/Keystone_1043.kicad_mod
+++ b/common.pretty/Keystone_1043.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_1043" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE0EA)
+  (tedit 60CF09BD)
   (tags "18650")
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -39.878) (layer "F.SilkS")
@@ -31,7 +31,7 @@
   (pad "" np_thru_hole circle (at -8.001 -27.6225) (size 3.556 3.556) (drill 3.556) (layers *.Cu *.Mask) (tstamp 6acccc2d-e5da-403d-9277-8b24fad18252))
   (pad "1" thru_hole circle (at 0 36.1315) (size 3.81 3.81) (drill 1.6256) (layers *.Cu *.Mask) (tstamp a5822e5c-659d-4562-98e5-954e92ff2968))
   (pad "2" thru_hole circle (at 0 -36.1315) (size 3.81 3.81) (drill 1.6256) (layers *.Cu *.Mask) (tstamp ab73cab2-d26e-4e8f-9d0c-bfde9f49cf97))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Keystone-PN1043.STEP"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_1043.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 180))
diff --git a/common.pretty/Keystone_5005_Red.kicad_mod b/common.pretty/Keystone_5005_Red.kicad_mod
index afaba69..98778cd 100644
--- a/common.pretty/Keystone_5005_Red.kicad_mod
+++ b/common.pretty/Keystone_5005_Red.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5005_Red" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE1F9)
+  (tedit 60CF09C4)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -16,7 +16,7 @@
   (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
   (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 49590010-7a45-410c-8756-1237127c0c5c))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Keystone_5005.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5005.step"
     (offset (xyz -0.508 0.254 2.3622))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_5006_Black.kicad_mod b/common.pretty/Keystone_5006_Black.kicad_mod
index a43a872..e4c37eb 100644
--- a/common.pretty/Keystone_5006_Black.kicad_mod
+++ b/common.pretty/Keystone_5006_Black.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5006_Black" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE1EB)
+  (tedit 60CF09CB)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -16,7 +16,7 @@
   (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
   (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp a365f7ad-6bb6-446e-b1e1-686de23af021))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Keystone_5006.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5006.step"
     (offset (xyz -0.508 0.254 2.3622))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_5007_White.kicad_mod b/common.pretty/Keystone_5007_White.kicad_mod
index 1aecba1..10537ef 100644
--- a/common.pretty/Keystone_5007_White.kicad_mod
+++ b/common.pretty/Keystone_5007_White.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5007_White" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE1D9)
+  (tedit 60CF09D3)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -16,7 +16,7 @@
   (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
   (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 47e5d966-6d8b-4689-91ec-61359066b0c3))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Keystone_5007.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5007.step"
     (offset (xyz -0.508 0.254 2.3622))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_5008_Orange.kicad_mod b/common.pretty/Keystone_5008_Orange.kicad_mod
index d2b6cce..8ebd922 100644
--- a/common.pretty/Keystone_5008_Orange.kicad_mod
+++ b/common.pretty/Keystone_5008_Orange.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5008_Orange" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE208)
+  (tedit 60CF09DA)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -16,7 +16,7 @@
   (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
   (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp fb652b97-c8c7-4804-b3fa-7377e18280ae))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Keystone_5008.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5008.step"
     (offset (xyz -0.508 0.254 2.3622))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_5009_Yellow.kicad_mod b/common.pretty/Keystone_5009_Yellow.kicad_mod
index bef9745..fe26d94 100644
--- a/common.pretty/Keystone_5009_Yellow.kicad_mod
+++ b/common.pretty/Keystone_5009_Yellow.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5009_Yellow" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE215)
+  (tedit 60CF09E2)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -16,7 +16,7 @@
   (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
   (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 3a22fad2-ecd6-4f64-a5d1-af6e32ba19a6))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Keystone_5009.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5009.step"
     (offset (xyz -0.508 0.254 2.3622))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_5010_Red.kicad_mod b/common.pretty/Keystone_5010_Red.kicad_mod
index a944994..5ffc3d6 100644
--- a/common.pretty/Keystone_5010_Red.kicad_mod
+++ b/common.pretty/Keystone_5010_Red.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5010_Red" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE225)
+  (tedit 60CF09E9)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -16,7 +16,7 @@
   (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
   (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 2e03a5c3-1c90-4ced-9108-4405283b33ce))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Keystone_5010.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5010.step"
     (offset (xyz -0.0129032 0.0064516 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_5011_Black.kicad_mod b/common.pretty/Keystone_5011_Black.kicad_mod
index 012b857..f82b263 100644
--- a/common.pretty/Keystone_5011_Black.kicad_mod
+++ b/common.pretty/Keystone_5011_Black.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5011_Black" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE232)
+  (tedit 60CF09F4)
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -16,7 +16,7 @@
   (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
   (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp f1dd22de-6f4c-4d96-8376-649f0eb10f2f))
   (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "/home/brendan/Documents/tempsync/projects/0000_KiCad/libraries/common.pretty/3dshapes/Keystone_5011.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5011.step"
     (offset (xyz -0.0129032 0.0064516 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Keystone_5019.kicad_mod b/common.pretty/Keystone_5019.kicad_mod
index 50d5fae..988f408 100644
--- a/common.pretty/Keystone_5019.kicad_mod
+++ b/common.pretty/Keystone_5019.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "Keystone_5019" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE28F)
+  (tedit 60CF0A0D)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.905 unlocked) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
diff --git a/common.pretty/L0402.kicad_mod b/common.pretty/L0402.kicad_mod
index fb50aeb..61748bc 100644
--- a/common.pretty/L0402.kicad_mod
+++ b/common.pretty/L0402.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "L0402" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEDFAE)
+  (tedit 60CF0A39)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.143) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,9 +23,9 @@
   (fp_line (start 0.51 -0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp e36f7cf0-3ac8-4f24-9ab1-1e5d5fd3584d))
   (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 04ea17fd-0308-4bd3-b107-293624c2290b))
   (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1cf8d131-b0f7-4575-b69e-503e16d6bc4b))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R0402.step"
-    (offset (xyz 0 0 0.1523999977))
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_0402HP.step"
+    (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
-    (rotate (xyz -90 0 0))
+    (rotate (xyz -90 0 90))
   )
 )
diff --git a/common.pretty/LED0402.kicad_mod b/common.pretty/LED0402.kicad_mod
index 3c9ea6a..d1752b3 100644
--- a/common.pretty/LED0402.kicad_mod
+++ b/common.pretty/LED0402.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "LED0402" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEDFC1)
+  (tedit 60CF0A49)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.143) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -28,7 +28,7 @@
   (fp_line (start 0.51 -0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp 7ba07a8e-500a-4f07-bee2-ec4f910e643c))
   (pad "A" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c3fe9190-4b76-45a0-9af5-623aa09bd045))
   (pad "K" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ab20e7b5-2838-408b-920c-c9c36e3eddf4))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/LED0402R.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/LED0402_red.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/LED0603.kicad_mod b/common.pretty/LED0603.kicad_mod
index 94605e6..877d9f6 100644
--- a/common.pretty/LED0603.kicad_mod
+++ b/common.pretty/LED0603.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "LED0603" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE2E5)
+  (tedit 60CF0A54)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.27) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -26,7 +26,7 @@
   (fp_line (start -0.85 -0.45) (end -0.85 0.45) (layer "F.Fab") (width 0.127) (tstamp 7632e9f1-7024-4df9-b5db-ce9bc7f30789))
   (pad "A" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 9e955bce-a5e5-48f2-8009-1b0b8e796406))
   (pad "K" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d55dcc18-aa59-4a4b-b99b-bb024214f364))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/LED0603R.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/LED0603_red.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/LSHM-150-03.0-L-DV-A-S-TR.kicad_mod b/common.pretty/LSHM-150-03.0-L-DV-A-S-TR.kicad_mod
index a26b638..3c42c98 100644
--- a/common.pretty/LSHM-150-03.0-L-DV-A-S-TR.kicad_mod
+++ b/common.pretty/LSHM-150-03.0-L-DV-A-S-TR.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "LSHM-150-03.0-L-DV-A-S-TR" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CDE768)
+  (tedit 60CF0A68)
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.429 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -125,7 +125,7 @@
   (pad "98" smd rect (at -11.75 -1.8669) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ee2b864a-6f12-41e2-b7d4-7ba105a5064b))
   (pad "99" smd rect (at -12.25 1.8415) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 86c9d74e-d970-4c69-a72d-7c6aec501c99))
   (pad "100" smd rect (at -12.25 -1.8669) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b94f531c-c19c-4de5-9a94-5cd9501aad6a))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/LSHM-150-03.0-L-DV-A-S-TR.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_LSHM-150-03.0-L-DV-A-S-TR.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/LSHM-150-03.0-L-DV-A-S-TR_DUAL.kicad_mod b/common.pretty/LSHM-150-03.0-L-DV-A-S-TR_DUAL.kicad_mod
index 6007174..010c857 100644
--- a/common.pretty/LSHM-150-03.0-L-DV-A-S-TR_DUAL.kicad_mod
+++ b/common.pretty/LSHM-150-03.0-L-DV-A-S-TR_DUAL.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "LSHM-150-03.0-L-DV-A-S-TR_DUAL" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 60233382)
+(footprint "LSHM-150-03.0-L-DV-A-S-TR_DUAL" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF0A96)
   (attr smd)
   (fp_text reference "REF**" (at 0 -3.429 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -245,7 +245,7 @@
   (pad "99B" smd rect (at -12.25 -1.8415) (size 0.3048 1.4986) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 4c096dd9-bb91-4321-a9a0-394e6bc46372))
   (pad "100A" smd rect (at -12.25 -1.8669) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 481d6ab1-32a7-420f-826e-aecbb4a2fa1d))
   (pad "100B" smd rect (at -12.25 1.8669) (size 0.3048 1.4986) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 5a9153b6-c9b6-49c6-b92b-12385b8e52a7))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/LSHM-150-03.0-L-DV-A-S-TR.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_LSHM-150-03.0-L-DV-A-S-TR.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/MPD_BK-335-SM.kicad_mod b/common.pretty/MPD_BK-335-SM.kicad_mod
index 277a5bc..0b69114 100644
--- a/common.pretty/MPD_BK-335-SM.kicad_mod
+++ b/common.pretty/MPD_BK-335-SM.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "MPD_BK-335-SM" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CDE795)
+  (tedit 60CF0AB7)
   (tags "SR512SW")
   (attr smd)
   (fp_text reference "BT2" (at 0 4.191) (layer "F.SilkS")
@@ -25,7 +25,7 @@
   (pad "2" smd rect (at 3.43 0) (size 1.52 3.05) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1ecb28f5-f651-4f39-b39e-fd8f5b145d58))
   (pad "2" smd rect (at -3.43 0) (size 1.52 3.05) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8e25543f-a685-4cb9-b6a9-4f3d9cfbcb49))
   (pad "2" smd rect (at 2.4 3 35.5) (size 1.78 1.64) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 95f5b494-23b0-46b6-ac38-ff93fcaed9b1))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/MPD-BK-335-SM.STEP"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/MPD_BK-335-SM.step"
     (offset (xyz 0 -0.7619999886 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/MYBSP01201ABF.kicad_mod b/common.pretty/MYBSP01201ABF.kicad_mod
index b2a515b..acd1898 100644
--- a/common.pretty/MYBSP01201ABF.kicad_mod
+++ b/common.pretty/MYBSP01201ABF.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "MYBSP01201ABF" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 6027622F)
+(footprint "MYBSP01201ABF" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF0AC2)
   (attr smd)
   (fp_text reference "REF**" (at 0 -14.097 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -19,7 +19,7 @@
   (pad "2" smd circle (at 5.5 11.5) (size 2.4 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c807207d-6b66-4527-b848-aa94abe755b4))
   (pad "3" smd circle (at 5.5 -11.5) (size 2.4 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp fa0e9be3-1c8c-41ff-98cd-9b94684e510f))
   (pad "4" smd circle (at -5.5 -11.5) (size 2.4 2.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2a5453b6-b9f9-4b56-9dec-7e70c605d566))
-  (zone (net 0) (net_name "") (layer "F.Cu") (tstamp 3f32441a-61bb-458f-9795-fadfd46c6d6c) (hatch edge 0.508)
+  (zone (net 0) (net_name "") (layer "F.Cu") (tstamp 02677ab1-6747-42a7-8054-b539a7491657) (hatch edge 0.508)
     (connect_pads (clearance 0))
     (min_thickness 0.254)
     (keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour not_allowed) (footprints allowed))
@@ -33,7 +33,7 @@
       )
     )
   )
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/MYBSP01201ABF.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Murata_MYBSP01201ABF.step"
     (offset (xyz -7.4 -13 4.5974))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/Molex_5022505191.kicad_mod b/common.pretty/Molex_5022505191.kicad_mod
index c6eee84..fde0ec9 100644
--- a/common.pretty/Molex_5022505191.kicad_mod
+++ b/common.pretty/Molex_5022505191.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "Molex_5022505191" (version 20210424) (generator pcbnew) (layer "F.Cu")
-  (tedit 60C5328C)
+(footprint "Molex_5022505191" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF0B05)
   (attr smd)
   (fp_text reference "REF**" (at 0 -4.572) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -13,14 +13,14 @@
     (effects (font (size 0.762 0.762) (thickness 0.127)))
     (tstamp 00000000-0000-0000-0000-000000000000)
   )
-  (fp_line (start 8.89 -3.81) (end 8.89 0.254) (layer "F.SilkS") (width 0.1778) (tstamp 00000000-0000-0000-0000-000000000000))
-  (fp_line (start 8.89 0.254) (end -8.89 0.254) (layer "F.SilkS") (width 0.1778) (tstamp 00000000-0000-0000-0000-000000000000))
   (fp_line (start -8.89 0.254) (end -8.89 -3.81) (layer "F.SilkS") (width 0.1778) (tstamp 00000000-0000-0000-0000-000000000000))
+  (fp_line (start 8.89 0.254) (end -8.89 0.254) (layer "F.SilkS") (width 0.1778) (tstamp 00000000-0000-0000-0000-000000000000))
+  (fp_line (start 8.89 -3.81) (end 8.89 0.254) (layer "F.SilkS") (width 0.1778) (tstamp 00000000-0000-0000-0000-000000000000))
   (fp_line (start -8.89 -3.81) (end 8.89 -3.81) (layer "F.SilkS") (width 0.1778) (tstamp 00000000-0000-0000-0000-000000000000))
-  (fp_line (start -8.55 -3.53) (end -8.55 0) (layer "F.Fab") (width 0.12) (tstamp 00000000-0000-0000-0000-000000000000))
-  (fp_line (start 8.55 -3.53) (end 8.55 0) (layer "F.Fab") (width 0.12) (tstamp 00000000-0000-0000-0000-000000000000))
   (fp_line (start 8.55 -3.53) (end -8.55 -3.53) (layer "F.Fab") (width 0.12) (tstamp 00000000-0000-0000-0000-000000000000))
   (fp_line (start 8.55 0) (end -8.55 0) (layer "F.Fab") (width 0.12) (tstamp 00000000-0000-0000-0000-000000000000))
+  (fp_line (start -8.55 -3.53) (end -8.55 0) (layer "F.Fab") (width 0.12) (tstamp 00000000-0000-0000-0000-000000000000))
+  (fp_line (start 8.55 -3.53) (end 8.55 0) (layer "F.Fab") (width 0.12) (tstamp 00000000-0000-0000-0000-000000000000))
   (fp_line (start 5.842 2.921) (end 6.223 2.54) (layer "F.Fab") (width 0.127) (tstamp 15cae4fa-dc24-4fdf-b013-6eca3265e9e9))
   (fp_line (start 5.842 2.159) (end 5.842 2.921) (layer "F.Fab") (width 0.127) (tstamp 23eeb229-1469-4bbe-b1e5-0d3ac5a090c6))
   (fp_line (start 3.81 2.54) (end 6.223 2.54) (layer "F.Fab") (width 0.127) (tstamp 2da00372-4775-40db-b35a-01aace6e971b))
@@ -28,8 +28,8 @@
   (fp_line (start 0.889 23.367999) (end 8.89 23.368) (layer "F.Fab") (width 0.127) (tstamp c2225028-671c-4ffb-9aef-a393c6e19e3f))
   (fp_line (start 6.223 2.54) (end 5.842 2.159) (layer "F.Fab") (width 0.127) (tstamp f13a32a7-2944-4e1d-a40e-df388df8e186))
   (fp_arc (start 1.143 13.208) (end 0.889 23.367999) (angle 88.56790382) (layer "F.Fab") (width 0.127) (tstamp bf3c038c-5d87-4ccc-aa01-66f4b13a57e0))
-  (pad "0" smd rect locked (at -8.2 -0.725) (size 0.4 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
   (pad "0" smd rect locked (at 8.2 -0.725) (size 0.4 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
+  (pad "0" smd rect locked (at -8.2 -0.725) (size 0.4 0.85) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
   (pad "1" smd rect locked (at -7.5 -0.4) (size 0.26 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
   (pad "2" smd rect locked (at -7.2 -3.275) (size 0.26 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
   (pad "3" smd rect locked (at -6.9 -0.4) (size 0.26 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
@@ -81,7 +81,7 @@
   (pad "49" smd rect locked (at 6.9 -0.4) (size 0.26 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
   (pad "50" smd rect locked (at 7.2 -3.275) (size 0.26 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
   (pad "51" smd rect locked (at 7.5 -0.4) (size 0.26 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
-  (model "${KIPRJMOD}/DisplayCoupon.pretty/3dmodels/5022505191.stp"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Molex_5051102291.step"
     (offset (xyz 0 2.032 0.4318))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/Molex_532610571.kicad_mod b/common.pretty/Molex_532610571.kicad_mod
index 76d183d..369838a 100644
--- a/common.pretty/Molex_532610571.kicad_mod
+++ b/common.pretty/Molex_532610571.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "Molex_532610571" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 60233365)
+(footprint "Molex_532610571" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF0AE8)
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.159) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.1778)))
@@ -27,9 +27,4 @@
   (pad "3" smd rect (at 0 -0.8) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp dae0eaec-69c0-4059-b610-c860ab82fbb1))
   (pad "4" smd rect (at -1.25 -0.8) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8fe09d58-db38-452c-ad5e-17983133a3fe))
   (pad "5" smd rect (at -2.5 -0.8) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 5618274c-38a0-436f-9cbc-74f688e084c5))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/532610571.stp"
-    (offset (xyz 0 -3.301999950408935 1.777999973297119))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 180))
-  )
 )
diff --git a/common.pretty/R0402.kicad_mod b/common.pretty/R0402.kicad_mod
index 3aaee82..1f50c5d 100644
--- a/common.pretty/R0402.kicad_mod
+++ b/common.pretty/R0402.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "R0402" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEDFD9)
+  (tedit 60CF0B2F)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.143) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -0.51 -0.26) (end -0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp e3c3ec5e-87fe-4aa4-9a0f-fcdd75bd2bf7))
   (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 823e5625-983f-454e-a16c-2e6f10f730e8))
   (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e7b1c9f3-3865-42db-813a-ced7b1bf1ad0))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R0402.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0402.step"
     (offset (xyz 0 0 0.1269999981))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/R0402_NOSILK.kicad_mod b/common.pretty/R0402_NOSILK.kicad_mod
index ee82731..b8e71db 100644
--- a/common.pretty/R0402_NOSILK.kicad_mod
+++ b/common.pretty/R0402_NOSILK.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "R0402_NOSILK" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEDFEB)
+  (tedit 60CF0B37)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.143) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start 0.889 0.508) (end 0.889 -0.508) (layer "F.Fab") (width 0.1778) (tstamp ee952dfe-ddf7-4284-9a01-dd1db090899b))
   (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 685cba04-af75-4b5a-8500-842a7f3cd3de))
   (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp fec9425c-c3d7-4869-b776-0407ea174cb5))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R0402.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0402.step"
     (offset (xyz 0 0 0.1269999981))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/R0603.kicad_mod b/common.pretty/R0603.kicad_mod
index 94b22a9..6c1e361 100644
--- a/common.pretty/R0603.kicad_mod
+++ b/common.pretty/R0603.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "R0603" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE30B)
+  (tedit 60CF08D1)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.27) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -0.85 0.45) (end 0.85 0.45) (layer "F.Fab") (width 0.127) (tstamp a2909340-5464-42e5-9c63-8262b960fc0f))
   (pad "1" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4b4aa2df-d0cd-4d05-ba6a-79ee766f172e))
   (pad "2" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp f3380bb1-00b8-43ad-aee0-a23229b40bb2))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R0603.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0603.step"
     (offset (xyz 0 0 0.2031999969))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/R0805.kicad_mod b/common.pretty/R0805.kicad_mod
index 6884d61..2013561 100644
--- a/common.pretty/R0805.kicad_mod
+++ b/common.pretty/R0805.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "R0805" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE332)
+  (tedit 60CF0B45)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.651) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -1 0.625) (end 1 0.625) (layer "F.Fab") (width 0.127) (tstamp f94c0d94-a696-4fac-8813-76e7743481e5))
   (pad "1" smd rect (at -0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e5507807-11a3-4e77-9ff4-3467001035c3))
   (pad "2" smd rect (at 0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d0905a64-390b-4fee-b906-7a756e2ec4c0))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R0805.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0805.step"
     (offset (xyz 0 0 0.2031999969))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/R1206.kicad_mod b/common.pretty/R1206.kicad_mod
index d6f523f..5c2153d 100644
--- a/common.pretty/R1206.kicad_mod
+++ b/common.pretty/R1206.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "R1206" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE3F8)
+  (tedit 60CF0B4D)
   (attr smd)
   (fp_text reference "REF**" (at 0 -1.778) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start 1.524 0.762) (end 1.524 -0.762) (layer "F.Fab") (width 0.127) (tstamp c3b0511f-78e2-4762-a5a3-ec12f0b6bef7))
   (pad "1" smd rect (at -1.4478 0) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1d575180-2fd5-44bb-9bf5-0873a8f9d573))
   (pad "2" smd rect (at 1.4478 0 180) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2eb6fe5d-32ca-4879-9de4-4b12615dc315))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R1206.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R1206.step"
     (offset (xyz 0 0 0.2667))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/R1210.kicad_mod b/common.pretty/R1210.kicad_mod
index a9e1f96..d1fae3b 100644
--- a/common.pretty/R1210.kicad_mod
+++ b/common.pretty/R1210.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "R1210" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CEE407)
+  (tedit 60CF0B54)
   (attr smd)
   (fp_text reference "REF**" (at 0 -2.286) (layer "F.SilkS")
     (effects (font (size 0.635 0.635) (thickness 0.127)))
@@ -23,7 +23,7 @@
   (fp_line (start -1.524 -1.27) (end 1.524 -1.27) (layer "F.Fab") (width 0.127) (tstamp add09646-f0c5-4791-8a2c-b21230921106))
   (pad "1" smd rect (at -1.397 0) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 3a9da9ef-54a5-4a25-a8c6-14d269b36ba7))
   (pad "2" smd rect (at 1.397 0 180) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cee6d469-554f-4715-83be-36ad744ee341))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/R1210.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R1210.step"
     (offset (xyz 0 0 0.2667))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/RaspberryPi-CM4.kicad_mod b/common.pretty/RaspberryPi-CM4.kicad_mod
index 9b362b9..5063dd1 100644
--- a/common.pretty/RaspberryPi-CM4.kicad_mod
+++ b/common.pretty/RaspberryPi-CM4.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "RaspberryPi-CM4" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60233D56)
+  (tedit 60CF0BCD)
   (attr exclude_from_pos_files)
   (fp_text reference "REF**" (at 0 19.812 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -30,7 +30,7 @@
   (pad "" smd circle (at -2.5 -17) (size 0.127 0.127) (layers "F.Mask") (tstamp a2115eca-f98f-4b59-9a56-86c1599a0aa7))
   (pad "" smd circle (at -2.5 17) (size 0.127 0.127) (layers "F.Mask") (tstamp c3e53664-28c1-4dcc-ae47-e1c4dd0a37bf))
   (pad "" np_thru_hole circle (at 24 -16.5) (size 5.08 5.08) (drill 2.9) (layers F&B.Cu *.Mask) (tstamp e1b1f92f-811c-4ba4-a48f-159d4f65c955))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/CM4.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/RaspberryPi_CM4.step"
     (offset (xyz -27.5 -36 3))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))
diff --git a/common.pretty/SPST_SKQG.kicad_mod b/common.pretty/SPST_SKQG.kicad_mod
index fbb4574..ddf6c2b 100644
--- a/common.pretty/SPST_SKQG.kicad_mod
+++ b/common.pretty/SPST_SKQG.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "SPST_SKQG" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CDD355)
+  (tedit 60CF0C14)
   (descr "ALPS 5.2mm Square Low-profile TACT Switch (SMD), http://www.alps.com/prod/info/E/PDF/Tact/SurfaceMount/SKQG/SKQG.PDF")
   (tags "SPST Button Switch")
   (attr smd)
@@ -44,7 +44,7 @@
   (pad "1" smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c3d28473-9aa1-4ef8-85f6-c11c789bb6e4))
   (pad "2" smd rect (at -3.1 1.85) (size 1.8 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 83d6b4bd-903f-4df8-b1fc-ae863481951a))
   (pad "2" smd rect (at 3.1 1.85) (size 1.8 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b9670e4b-69e7-4efb-9de2-29876767aa33))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/PTS525SM15SMTR2LFS.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/CK_PTS525SM15SMTR2LFS.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 90 0))
diff --git a/common.pretty/TE_1-2301994-5.kicad_mod b/common.pretty/TE_1-2301994-5.kicad_mod
index a580575..4363484 100644
--- a/common.pretty/TE_1-2301994-5.kicad_mod
+++ b/common.pretty/TE_1-2301994-5.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "TE_1-2301994-5" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CDE6A2)
+  (tedit 60CF0C3C)
   (descr "Connector, RJ45")
   (attr through_hole)
   (fp_text reference "REF**" (at -0.127 -15.748) (layer "F.SilkS")
@@ -35,9 +35,4 @@
   (pad "10" thru_hole circle (at 2.921 -13.716) (size 1.905 1.905) (drill 1.02) (layers *.Cu *.Mask) (tstamp 7e2ec03e-8422-4a9e-ad48-001a843c8de2))
   (pad "11" thru_hole circle (at -2.921 -13.716) (size 1.905 1.905) (drill 1.02) (layers *.Cu *.Mask) (tstamp 040b78be-3517-4329-a1b9-a4de59fbc426))
   (pad "12" thru_hole circle (at -5.461 -13.716) (size 1.905 1.905) (drill 1.02) (layers *.Cu *.Mask) (tstamp 4dccd4a2-de6a-4b04-88ae-6bd002a3f9a5))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Conn_RJ45_TE_1-2301994-5.step"
-    (offset (xyz 0 -10.795 7.112))
-    (scale (xyz 1 1 1))
-    (rotate (xyz -90 0 0))
-  )
 )
diff --git a/common.pretty/TE_6116075-1.kicad_mod b/common.pretty/TE_6116075-1.kicad_mod
index 8a22554..a32cac5 100644
--- a/common.pretty/TE_6116075-1.kicad_mod
+++ b/common.pretty/TE_6116075-1.kicad_mod
@@ -1,5 +1,5 @@
 (footprint "TE_6116075-1" (version 20210606) (generator pcbnew) (layer "F.Cu")
-  (tedit 60CDE6BD)
+  (tedit 60CF0C46)
   (descr "Connector, RJ45")
   (attr through_hole)
   (fp_text reference "REF**" (at 0 -11.811) (layer "F.SilkS")
@@ -35,7 +35,7 @@
   (pad "10" thru_hole circle locked (at 4.572 -9.144) (size 1.524 1.524) (drill 0.889) (layers *.Cu *.Mask) (tstamp ef7d7d97-bbcb-49b9-b9e0-77f827c6e5ce))
   (pad "11" thru_hole circle locked (at -4.572 -9.144) (size 1.524 1.524) (drill 0.889) (layers *.Cu *.Mask) (tstamp 5819f04d-f4be-4a4c-b8c3-74b33da6377b))
   (pad "12" thru_hole circle locked (at -6.858 -9.144) (size 1.524 1.524) (drill 0.889) (layers *.Cu *.Mask) (tstamp 279e4e22-f4bf-4e35-a8ce-0d5148b250d0))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/Conn_RJ45_TE_6116075-1.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/TE_6116075-1.step"
     (offset (xyz 0 -5.08 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
diff --git a/common.pretty/TP-035.kicad_mod b/common.pretty/TP-035.kicad_mod
index c83c2f3..0815499 100644
--- a/common.pretty/TP-035.kicad_mod
+++ b/common.pretty/TP-035.kicad_mod
@@ -1,4 +1,4 @@
-(footprint "TP-035" (version 20210424) (generator pcbnew) (layer "F.Cu")
+(footprint "TP-035" (version 20210606) (generator pcbnew) (layer "F.Cu")
   (tedit 6023326B)
   (attr exclude_from_pos_files exclude_from_bom)
   (fp_text reference "REF**" (at 0 -0.889) (layer "F.SilkS")
diff --git a/common.pretty/Vicor_PI31xx-0x-HVIZ.kicad_mod b/common.pretty/Vicor_PI31xx-0x-HVIZ.kicad_mod
index e4beb8e..90ba132 100644
--- a/common.pretty/Vicor_PI31xx-0x-HVIZ.kicad_mod
+++ b/common.pretty/Vicor_PI31xx-0x-HVIZ.kicad_mod
@@ -1,5 +1,5 @@
-(footprint "Vicor_PI31xx-0x-HVIZ" (version 20210126) (generator pcbnew) (layer "F.Cu")
-  (tedit 60233254)
+(footprint "Vicor_PI31xx-0x-HVIZ" (version 20210606) (generator pcbnew) (layer "F.Cu")
+  (tedit 60CF0C62)
   (attr smd)
   (fp_text reference "REF**" (at 0 -9.525 unlocked) (layer "F.SilkS")
     (effects (font (size 0.762 0.762) (thickness 0.127)))
@@ -33,7 +33,7 @@
   (pad "SGND" smd rect (at -10.4394 0) (size 1.3716 1.3208) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8a455e50-bfbc-4a65-a18b-b2eaae2d726f))
   (pad "TM" smd rect (at -8.5598 0.9906) (size 1.3716 1.3208) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2b219428-9b3c-430f-b82c-7dd4ff5db483))
   (pad "TRIM/SS" smd rect (at -10.4394 2.0066) (size 1.3716 1.3208) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp df8a377a-f033-408e-8bfa-13bdcef2801b))
-  (model "${KICAD_USER_LIB_DIR}/common.pretty/3dshapes/PI31xx.step"
+  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Synqor_PI31xx.step"
     (offset (xyz 0 0 0))
     (scale (xyz 1 1 1))
     (rotate (xyz 0 0 0))