Template overhaul