lists/template update

Prep for Tehuantl and tidying up.