Expand templates

From feudalife
Expand templates