wip on templates and theme