Now using popover for all options + theme dom fix