Switch to real templates
Move titles under template control