Merged in the new templates and -nosse

All green, but the alternative siteVariants give the wrong answer, so
they are not included.