Update default.xml

And s2-common to CM now.. Next!