Two changes that barely interfere with each other.
But the modularization took a redesign of the color system with it, which has to be manually merged, as well as some other JS might not be recognized by git as the same.
Though this will only be necessary once all bugs with modularization have been fixed.