default.xml: Update to WIP