Modernize the settings a bit