Add defaults, deal w/ only default config
New config key names
Go back to old config default system