Template improvements

various improvements to templates:
 - better tests
 - changed the theme names to 'standard' and 'alternate'
 - fixes for bugs seen when using both a default aspect and a default bladeset