I think that'd be the best thing to do, you could also include the nature of the transition (e.g quick, slow) in the parenthesis instead of the the theme it's related to, or perhaps both.