Update sources to be compatible with the 2.0 manifest & APIs