Overhaul templates