New config files and tasty modifications ...