Fix typo
Add popover colors
#555 for black