Add proper assets
Merge remote-tracking branch 'origin/master'
Fix more stuff