Refactor themes to have an app.js per theme