sync both themes with toolkit winstripe changes in Mozilla 14