sync both themes with Mozilla 11 toolkit winstripe changes