I would recommend The Mystery Codex for WitchCraft. It has a lot of the same stuff that you mention.

Frank Frey