Bundle all the things
Update icons
Test for external URLs