Misc cleanups to templates
Misc cleanups to templates

wbg-optronix-lab/emergence-lab,emergence-lab/emergence-lab,wbg-optronix-lab/emergence-lab,emergence-lab/emergence-lab,emergence-lab/emergence-lab,wbg-optronix-lab/emergence-lab