sync both themes with toolkit windows/shared changes in Mozilla 27 cycle