changing setting var name, expanding conditionals, moving settings