Revamp manifest

Prepare for l-preview