Cleaning up little bit, more to be done still

Also adds offline image. Themed resources will work automatically,
others has to be injected to manifest.