Pretty much. Also, with Shinano having a moon theme and Musashi having a storm theme, it's almost a guarantee that when we get Yamato, she will be sun themed.
Just wanted to say I just found your channel today, have listened to all of them, and really enjoy the songs you've chosen to represent the characters. You've earned a sub from me and I'm looking forward to your future uploads.