Small tweaking

- most configuration can be done from assets.json
Merge commit 'e3948e7'