Merge new theme into master to see if Heroku is stable, will roll back if not.