Switched a few hardcoded things to use the settings class