Rewrite default.xml

Overall clean up plus i was bored