Update racoon templates to match Thomas' latest