Update theme infrastructure and rebuild
Merge manually and rebuild
Update grunt setup to latest and greatest