cleanup templates to work with new config
correct template
correct default