Added support for theme template inheritance proposed in Issue # 80