Migrate to new settings format