Kangie

Merge more templates.