Expand templates

From DWIKI
Expand templates