sync both themes with toolkit winstripe changes up to 2001-03-13