Fulah: update against templates