Update default.xml

rebase fw & settings