Haunted Mansion

In Adventureland next to The Princess and the Frog: Floating Down the Bayou ride would be the Haunted Mansion. Although it would have a more swampy look similar to the house in the live action movie.

http://www.hauntjaunts.net/blog/wp-content/uploads/2011/11/gracey_mansion.jpg

It would also have projections of some will o wisps (From the Pixar movie Brave) both inside and around the grounds of the mansion

http://images4.wikia.nocookie.net/__cb20130224180436/pixar/images/b/b1/Wisp_full.jpg

http://preraphaelitesisterhood.com/wp-content/uploads/2012/11/brave.jpg   

Here is the video for the Disneyland version of The Haunted Mansion after the Hatbox Ghost returned. Watch the stretching room video first and then the rest of the ride

                        Stretching Room

                         Full Ride

And of course during the Halloween/Christmas time it would be decked out with The Nightmare Before Christmas for The Haunted Mansion Holiday (The video is the 2014 version)