I think we should try to follow along with making sure everything fits into a category since 6 years worth of development will, of course, lead to a lot more to this than it seems.
And, turns out, there is. It seems that even in organic terms, there's much more than meets the eye, like the possibility of the people behind our enemies this time not just consistently being staff members, or the possibility that the Toons are their own hivemind separate from the mascots.
So maybe something similar should be tried to categorise everything besides the characters, such as locations and levels.
Maybe we should start by segragating both the Custom Night levels to each game by changing the headings to read "Custom Night (Official)" and "Custom Night (Anniversary Edition)" so they're both on two distinct pages, and then working on categorising every minor detail from that point onward.
It's called organisation.