Some modifications to templates

To suit my personal needs.