even more configuration + theme changes