Update to latest Surrey template URLs