Expand templates

Ta'yuki guatu: nabegasion, aligao
Expand templates