Templating: TemplateNavigator cleanup
Theme: ThemeResources added