Changed theme and fixed popup crashbug.