Not really. All I plan is to "merge" each location so that we just don't consider each minigame as a separate location, like how I believe that the FNaF 4 Location is the same Sister Location Phone Guy talks about in FNaF 3.
I still don't know yet how I will incorporate everything, since I'm a lazy bum and I don't... Really work that much. The only reason that I only finished my second Master Theory is because eh... There wasn't much to do, to be honest.