Renamed the template files again. Imho the default template should
include all functionality that the theme offers, because this may
be what users expect intuitively.