fixed ander theme and including xtbgenerator