Major rewrite of settings bundle.