More noLegacyStyle

Turning into a beautiful spec :heart_eyes:. Should hopefully be able to bring the last bits together tomorrow and monday.