Expand templates

From Hispanopedia
Expand templates