Updates to all templates including adding base_intrerior