Add some apps and settings
Upgrade Boxen from upstream