Expand templates

From Doku
Expand templates