Fork from iDorel77 - Added Assets and missing files