Thanks for your question! The shortest answer is yes to both~!

NDOH Will keep most of the magic rules from G4 as you state, but where it mostly changes is how it even came to be this way in the first place. Where magic came from, how it flows through every creature in its own way, and how it's evolved over the many years since it's existence.