Expand templates

From MolEvol
Expand templates