Expand templates

From Ameise-en
Expand templates