diff --git a/content/klc/G1.1.adoc b/content/klc/G1.1.adoc
index e61b10c5..1b0c876f 100644
--- a/content/klc/G1.1.adoc
+++ b/content/klc/G1.1.adoc
@@ -2,7 +2,7 @@
 brief = "Only standard characters are used for naming libraries and components"
 +++
 
-Filenames, symbol names, footprint names and model names must contain only valid characters, as determined below:
+Filenames, symbol names, footprint names, model names and template names must contain only valid characters, as determined below:
 
 . Alphanumeric characters (`A-Z`, `a-z`, `0-9`)
 . Underscore `_`
diff --git a/content/klc/G1.5.adoc b/content/klc/G1.5.adoc
index 7d168e75..f1d57bef 100644
--- a/content/klc/G1.5.adoc
+++ b/content/klc/G1.5.adoc
@@ -7,4 +7,4 @@ In general, plural naming (e.g. for libraries) should be avoided, as pluralisati
 * `Sensor_Temperature` instead of `Sensors_Temperature`
 * `Memory_Flash` instead of `Memories_Flash`
 * `TerminalBlock` instead of `TerminalBlocks`
-
+* `ArduinoShield` instead of `ArduinoShields`
diff --git a/content/klc/G1.8.adoc b/content/klc/G1.8.adoc
index 5ee6c2da..2c05b15c 100644
--- a/content/klc/G1.8.adoc
+++ b/content/klc/G1.8.adoc
@@ -2,6 +2,6 @@
 brief = "Components can only contain features supported in latest stable release"
 +++
 
-KiCad library components (symbols, footprints) may only contain features that are supported by the latest __stable__ KiCad software release.
+KiCad library components (symbols, footprints, templates) may only contain features that are supported by the latest __stable__ KiCad software release.
 
 Features introduced in nightly builds are not allowed in official KiCad library files.
diff --git a/content/libraries/klc.adoc b/content/libraries/klc.adoc
index e7394e69..a7a0ba87 100644
--- a/content/libraries/klc.adoc
+++ b/content/libraries/klc.adoc
@@ -43,7 +43,7 @@ __Note: While many of the KLC guidelines are checked by these scripts, there are
 
 == General Library Guidelines
 
-The general library guidelines apply to all library elements (symbols / footprints / models). However, these guidelines may be overridden in some cases by specific exceptions described in further sections.
+The general library guidelines apply to all library elements (symbols / footprints / models / templates). However, these guidelines may be overridden in some cases by specific exceptions described in further sections.
 
 {{< klc_list title="General Guidelines" filter="G1.">}}
 
diff --git a/content/libraries/klc_history.adoc b/content/libraries/klc_history.adoc
index 24ffe0de..4c10c81b 100644
--- a/content/libraries/klc_history.adoc
+++ b/content/libraries/klc_history.adoc
@@ -5,6 +5,10 @@ url = "/libraries/klc/history/"
 +++
 
 ---
+
+== 3.0.20 - 2019-06-25
+* Change general guidelines (G) to mention templates
+
 == 3.0.19 - 2019-06-19
 * Clarify symbol naming for symbols with multiple manufactureres with different package suffixes (S2.1)
 * Added more details on silk-to-pad clearance (F5.1)