Update to manifest V2

Hi,

I converted some stuff to be compatible with manifest V2. What do you think about it?


Thilko