Fixed main.  Fixed templates in common extensions.