More manifestations!

Huge cleanup of te manifest.
Merge pull request #2 from Berco/master

Again a cleanup :)