#286 Getting rid of most of templates/core/*.html files