Mostly right, though I still don't have a concrete idea for Lust (specifically Succubus), Pride, and Envy. Pride may have the mini-GTS theme now that I'm thinking about it
