I can care less about theming inside a store. The shop at Epcot is what it's suppose to be: clean, lots of natural light and simple. The new Universal store is also clean and simple.
As much as I love the tribute stores/legacy store at CityWalk, they are a pain to maneuver about.