Now taking a second argument, used for theme name in non-interactive mode