default.xml: more switching over