Update Manifest content and main.xml header

Also delete the .settings/ folder