Full template overhaul