Switch Template6 and XML back to supernovus++