Update to new settings format