Fix change in class name.
Use a sub folder in the theme to hold the templates.
Make the templates more generic to fit within the default themes.