Changed setings to settings
Source settings files more programatically (way less lines)
Updates to settings files; cleanup