Expand templates

From Papgi.org
Expand templates