add OmniSwitch

Conflicts:
	default.xml
Revert "add OmniSwitch"

This reverts commit adf3a83d13a93b2e0b545fcac8f45703a20b1936.