Branch with follow up fixes to the settins rework.
Until now, there are no critical bugfixes, just some improvements. Though, I keep testing the behavior, so I might push more patches (if review for this takes longer than it takes me to find issues).