store theme and activity fix