Added new theme template structure