Expand templates

Genda ku: Ndagiriro, kunoonya
Expand templates