Cleaned-up Switcher.xml; updated zip