Added rest of Shapeshifts into toggle
Revert "Added rest of Shapeshifts into toggle"

This reverts commit 8819f0a4b2a58957367284ff1b1fdbe3edfad617.
Revert "Revert "Added rest of Shapeshifts into toggle""

This reverts commit a077c3d82f5c4bd805dd3d8391e890e1c3340592.