Tweak matrix colors and fix popover removal bug