Redo most of configuration stuff (again)