diff --git a/template/fp-lib-table.for-github b/template/fp-lib-table.for-github
index 82f79e3a..8447aff5 100644
--- a/template/fp-lib-table.for-github
+++ b/template/fp-lib-table.for-github
@@ -1,6 +1,5 @@
 (fp_lib_table
   (lib (name Air_Coils_SML_NEOSID)(type Github)(uri ${KIGITHUB}/Air_Coils_SML_NEOSID.pretty)(options "")(descr HAMxx31A_HDMxx31A))
-  (lib (name Battery_Holders) (type Github) (uri ${KIGITHUB}/Battery_Holders.pretty)(options "")(descr "Batteries and battery holder footprints"))
   (lib (name Buttons_Switches_SMD)(type Github)(uri ${KIGITHUB}/Buttons_Switches_SMD.pretty)(options "")(descr "Buttons and switches, surface mount"))
   (lib (name Buttons_Switches_ThroughHole)(type Github)(uri ${KIGITHUB}/Buttons_Switches_ThroughHole.pretty)(options "")(descr "Buttons and switches, through hole"))
   (lib (name Buzzers_Beepers)(type Github)(uri ${KIGITHUB}/Buzzers_Beepers.pretty)(options "")(descr "Audio signalling devices"))
@@ -12,7 +11,6 @@
   (lib (name Choke_Radial_ThroughHole)(type Github)(uri ${KIGITHUB}/Choke_Radial_ThroughHole.pretty)(options "")(descr "Chokes, radial, through hole"))
   (lib (name Choke_SMD)(type Github)(uri ${KIGITHUB}/Choke_SMD.pretty)(options "")(descr "Chokes, surface mount"))
   (lib (name Choke_Toroid_ThroughHole)(type Github)(uri ${KIGITHUB}/Choke_Toroid_ThroughHole.pretty)(options "")(descr "Chokes, toroid, through hole"))
-  (lib (name Connectors_Amphenol)(type Github)(uri ${KIGITHUB}/Connectors_Amphenol.pretty)(options "")(descr "Amphenol connector footprints"))
   (lib (name Connectors_Harwin)(type Github)(uri ${KIGITHUB}/Connectors_Harwin.pretty)(options "")(descr "Harwin connector footprints www.harwin.com"))
   (lib (name Connectors_Hirose)(type Github)(uri ${KIGITHUB}/Connectors_Hirose.pretty)(options "")(descr "Hirose connector footprints www.hirose.com"))
   (lib (name Connectors_JAE)(type Github)(uri ${KIGITHUB}/Connectors_JAE.pretty)(options "")(descr "JAE connector footprints http://www.jae.com/jccom/en/connectors"))
@@ -20,6 +18,7 @@
   (lib (name Connectors_Molex)(type Github)(uri ${KIGITHUB}/Connectors_Molex.pretty)(options "")(descr "Molex connector foottprints www.molex.com"))
   (lib (name Connectors_Multicomp)(type Github)(uri ${KIGITHUB}/Connectors_Multicomp.pretty)(options "")(descr "Multicomp connector footprints"))
   (lib (name Connectors_Phoenix)(type Github)(uri ${KIGITHUB}/Connectors_Phoenix.pretty)(options "")(descr "Phoenix connector footprints"))
+  (lib (name Connectors_Samtec)(type Github)(uri ${KIGITHUB}/Connectors_Samtec.pretty)(options "")(descr "Samtec connector footprints"))
   (lib (name Connect)(type Github)(uri ${KIGITHUB}/Connect.pretty)(options "")(descr "Assorted connector footprints"))
   (lib (name Converters_DCDC_ACDC)(type Github)(uri ${KIGITHUB}/Converters_DCDC_ACDC.pretty)(options "")(descr "DC-DC and AC-DC convertor modules"))
   (lib (name Crystals)(type Github)(uri ${KIGITHUB}/Crystals.pretty)(options "")(descr "Crystals and oscillators"))
diff --git a/template/fp-lib-table.for-pretty b/template/fp-lib-table.for-pretty
index d79d6ce1..d18e1d0a 100644
--- a/template/fp-lib-table.for-pretty
+++ b/template/fp-lib-table.for-pretty
@@ -1,6 +1,5 @@
 (fp_lib_table
   (lib (name Air_Coils_SML_NEOSID)(type KiCad)(uri ${KISYSMOD}/Air_Coils_SML_NEOSID.pretty)(options "")(descr HAMxx31A_HDMxx31A))
-  (lib (name Battery_Holders) (type KiCad) (uri ${KISYSMOD}/Battery_Holders.pretty)(options "")(descr "Batteries and battery holder footprints"))
   (lib (name Buttons_Switches_SMD)(type KiCad)(uri ${KISYSMOD}/Buttons_Switches_SMD.pretty)(options "")(descr "Buttons and switches, surface mount"))
   (lib (name Buttons_Switches_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Buttons_Switches_ThroughHole.pretty)(options "")(descr "Buttons and switches, through hole"))
   (lib (name Buzzers_Beepers)(type KiCad)(uri ${KISYSMOD}/Buzzers_Beepers.pretty)(options "")(descr "Audio signalling devices"))
@@ -12,7 +11,6 @@
   (lib (name Choke_Radial_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Choke_Radial_ThroughHole.pretty)(options "")(descr "Chokes, radial, through hole"))
   (lib (name Choke_SMD)(type KiCad)(uri ${KISYSMOD}/Choke_SMD.pretty)(options "")(descr "Chokes, surface mount"))
   (lib (name Choke_Toroid_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Choke_Toroid_ThroughHole.pretty)(options "")(descr "Chokes, toroid, through hole"))
-  (lib (name Connectors_Amphenol)(type KiCad)(uri ${KISYSMOD}/Connectors_Amphenol.pretty)(options "")(descr "Amphenol connector footprints"))
   (lib (name Connectors_Harwin)(type KiCad)(uri ${KISYSMOD}/Connectors_Harwin.pretty)(options "")(descr "Harwin connector footprints www.harwin.com"))
   (lib (name Connectors_Hirose)(type KiCad)(uri ${KISYSMOD}/Connectors_Hirose.pretty)(options "")(descr "Hirose connector footprints www.hirose.com"))
   (lib (name Connectors_JAE)(type KiCad)(uri ${KISYSMOD}/Connectors_JAE.pretty)(options "")(descr "JAE connector footprints http://www.jae.com/jccom/en/connectors"))
@@ -20,6 +18,7 @@
   (lib (name Connectors_Molex)(type KiCad)(uri ${KISYSMOD}/Connectors_Molex.pretty)(options "")(descr "Molex connector foottprints www.molex.com"))
   (lib (name Connectors_Multicomp)(type KiCad)(uri ${KISYSMOD}/Connectors_Multicomp.pretty)(options "")(descr "Multicomp connector footprints"))
   (lib (name Connectors_Phoenix)(type KiCad)(uri ${KISYSMOD}/Connectors_Phoenix.pretty)(options "")(descr "Phoenix connector footprints"))
+  (lib (name Connectors_Samtec)(type KiCad)(uri ${KISYSMOD}/Connectors_Samtec.pretty)(options "")(descr "Samtec connector footprints"))
   (lib (name Connect)(type KiCad)(uri ${KISYSMOD}/Connect.pretty)(options "")(descr "Assorted connector footprints"))
   (lib (name Converters_DCDC_ACDC)(type KiCad)(uri ${KISYSMOD}/Converters_DCDC_ACDC.pretty)(options "")(descr "DC-DC and AC-DC convertor modules"))
   (lib (name Crystals)(type KiCad)(uri ${KISYSMOD}/Crystals.pretty)(options "")(descr "Crystals and oscillators"))