Improve popover, update colors