Update default.xml

Well look at this huge commit