Thanks :)
I'm finally happy with the new structure of the transitions. Just need a little bit more testing...