Bunch of Vanilla+ additions
Cactus/Flint tools, Athame