Add titles back to templates..