Templates: Move common parts to included templates