update both themes for toolkit winstripe trunk changes up to 2009-11-06