           cwd: chromeAppDevPath
           src: [
             'manifest.json'
-            '*.html'
-
-            'bower/webcomponentsjs/webcomponents.min.js'
-            'bower/polymer/polymer.js'
+            '_locales/**'
 
             # UI for not-connected
             # This is not browserified so we use .js instead of .static.js
             'polymer/vulcanized.{html,js}'
 
-            # actual scripts that run things
-            'freedomjs-anonymized-metrics/anonmetrics.json'
-            'freedomjs-anonymized-metrics/metric.js'
             'freedom-for-chrome/freedom-for-chrome.js'
-            'freedom-social-github/social.github.json'
-            'freedom-social-github/github-social-provider.js'
-            'freedom-social-firebase/social.firebase-facebook.json'
-            'freedom-social-firebase/social.firebase-google.json'
-            'freedom-social-firebase/firebase-shims.js'
-            'freedom-social-firebase/firebase.js'
-            'freedom-social-firebase/firebase-social-provider.js'
-            'freedom-social-firebase/facebook-social-provider.js'
-            'freedom-social-firebase/google-social-provider.js'
-            'freedom-social-firebase/google-auth.js'
-            'freedom-port-control/port-control.js'
-            'freedom-port-control/port-control.json'
-            'freedom-pgp-e2e/end-to-end.compiled.js'
-            'freedom-pgp-e2e/googstorage.js'
-            'freedom-pgp-e2e/e2e.js'
-            'freedom-pgp-e2e/pgpapi.json'
-
-            '**/freedom-module.json'
-            '!generic_core/freedom-module.json'
-            '**/*.static.js'
-            '!**/*spec*'
-
-            'icons/*'
-            'fonts/*'
-            '_locales/**'
-          ]
+          ].concat coreDistFiles
+            .concat universalDistFiles
           dest: 'build/dist/chrome/app'
         }
         { # Chrome app freedom-module

  'uproxy-lib/loggingprovider'
  'uproxy-lib/churn-pipe'
  'uproxy-lib/cloud/social'
]

gruntConfig = {

            # addon sdk scripts
            'lib/**/*.js'

            'data/generic_ui/scripts/get_logs.js'
            'data/scripts/content-proxy.js'

            'data/freedom-for-firefox/freedom-for-firefox.jsm'
          ].concat getWithBasePath(uiDistFiles, 'data')
            .concat getWithBasePath(coreDistFiles, 'data')
            .concat getWithBasePath(universalDistFiles, 'data')
          dest: 'build/dist/firefox'
        }
        { # Firefox freedom-module
