[@Draconequis] I mean, if Amarante and/or Shadow can be encountered on their own, then whatever works for you. I'd just recommend that they nominally be encountered together under Amarante's theme, since she's the master figure in that relationship.