More settings (almost) complete