*design (TM)*
Untested changes for settings.