Migrate template selection in WebStoreSelector block.
Migrate template selection in menu, siteMap and thread blocks.
Use template parameters to reduce the number of menu templates.
Minor fixes and clean up.