Move more common stuff to default template.