This is going to be a bit of a rant, so if you don't want to hear me sound like a crotchety old man, leave now. You've been warned.
If there's one phrase I'm tired of hearing, it's "make it work." Usually, it will come into the discussion something like this: "I know this doesn't really fit the theme, but I believe in Disney. They'll make it work." The point of theming is not to "make it work." You shouldn't have to turn your head, squinch up your eyes real tight, and then open your left one halfway to see how something fits the theme. It fits or it doesn't fit.
This mantra of "make it fit" is also responsible for the convoluted backstories that have grown like kudzu from WDI. Yes, there were backstories before, but most of the time, they were never revealed to the audience. They were simply devices used to stimulate the Imagineers' imaginations as they designed the project. Nowadays, a complicated backstory is necessary to explain what would otherwise be a laughable break in the theme. The story must be spoon fed to the audience to help them understand why the ride supposedly fits when it so blatantly doesn't.
I understand that Imagineering's hands are tied. Their job is no longer to design alternate worlds and bring them to life; it is to leverage franchise branded product on the platform called DL. Fine. So why keep pretending? Why not just come right out and say it? How about this?
"The era of the cohesive, tightly themed land is over. It was fun while it lasted and we will fondly remember this brief phase in the development of the amusement park. We find, however, that in this day and age, our customers are more concerned w/ having fun. Our surveys tell us that if the ride is fun, it doesn't matter whether it fits some arbitrarily defined 'theme.' The customers know they're not in some alternate world, so let's not insult their intelligence by telling them they are. Theming, at its heart, is really just a way to group a bunch of rides together, so let's not pretend it's something more. W/ that, we welcome you to the new Marveldisneyavatarfantasystudiosland."