Update default.xml

many fixes ... someday I wont commit mistakes ...