Yes, this is JUST Return of the Jedi. Like ANH, there are six shelves devoted entirely to Jedi. (Empire has five shelves.) Here are three of the Jedi shelves. Jabba's Palace, Jabba's dungeon and the Rebel Fleet at Sullust. One thing that has been very interesting, noting the many variations of vehicles over the years, is that I've selected what I think are the very best representations of each vehicle, in addition to their vintage counterparts. So here, you see the best of the best A-Wing, B-Wing and Millennium Falcon, which I think is the greatest Star Wars toy ever made. Again, this is not the final arrangement, but it's getting close.
Another interesting thing to observe is how the vintage figures hang with the modern figures. In rare cases, they work pretty well mixed together. But mostly, I like to keep them a bit separated. So, if you look closely, you can see the vintage figures on the left side of Jabba's palace and the modern figures on the right. Just that small delineation helps everything look "right".
Also, like the vehicles, I use what I think are the best of the best figures. For example, the Boushh figure at the far right is from 2007, though another one was released just last year. The earlier version stands better, has a better paint job and is just a generally better representation of the character. Rarely, though, do I go back to the mid-90's Power of the Force figures, though, which were great toys, but often too big or had odd poses. There are a few characters from that era that haven't been remade, though, including one or two of Jabba's crew members and Mon Mothma!
More to come...