Expand templates

From GiderosMobile
Expand templates