Updated templates to use new theme