diff --git a/grunt/aliases.yaml b/grunt/aliases.yaml
index d177eb6c4..638274bd6 100644
--- a/grunt/aliases.yaml
+++ b/grunt/aliases.yaml
@@ -81,3 +81,14 @@ release:
     - htmlmin
     - imagemin
     - uglify
+
+release:quick:
+  tasks:
+    - env:prod
+    - clean:release
+    - copy:release
+    - string-replace:production
+    - check-release-version
+    - string-replace:latest_version
+    - optimize-build
+    - string-replace:final
diff --git a/grunt/optimize-build.js b/grunt/optimize-build.js
index 3816e6f65..d44012a47 100644
--- a/grunt/optimize-build.js
+++ b/grunt/optimize-build.js
@@ -1,231 +1,166 @@
-module.exports = function(grunt) {
-  var PATHS = {
-    'backbone-validation': 'empty:',
-    'backbone.stickit': 'empty:',
-    'backbone.wreqr': 'empty:',
-    backbone: 'empty:',
-    bootstrap: 'empty:',
-    bowser: 'empty:',
-    classnames: 'empty:',
-    clipboard: 'empty:',
-    'create-react-class': 'empty:',
-    'd3-cloud': 'empty:',
-    d3: 'empty:',
-    filesaver: 'empty:',
-    'google-recaptcha': 'empty:',
-    'google-analytics': 'empty:',
-    jquery: 'empty:',
-    'jquery-ui': 'empty:',
-    'jquery-querybuilder': 'empty:',
-    jsonpath: 'empty:',
-    marionette: 'empty:',
-    mathjax: 'empty:',
-    moment: 'empty:',
-    'persist-js': 'empty:',
-    'react-bootstrap': 'empty:',
-    'react-dom': 'empty:',
-    'prop-types': 'empty:',
-    'react-redux': 'empty:',
-    react: 'empty:',
-    'redux-thunk': 'empty:',
-    redux: 'empty:',
-    requirejs: 'empty:',
-    reselect: 'empty:',
-    select2: 'empty:',
-    sprintf: 'empty:',
-    underscore: 'empty:',
-    'discovery.vars': 'empty:',
-    yup: 'empty:',
-    'react-hook-form': 'empty:',
-    'react-flexview': 'empty:',
-    'styled-components': 'empty:',
-    'react-is': 'empty:',
-    'react-data-table-component': 'empty:',
-    'react-window': 'empty:',
-    'react-async': 'empty:',
-    diff: 'empty:',
-    hotkeys: 'empty:',
-    'react-transition-group': 'empty:',
-    'regenerator-runtime': 'empty:',
-    '@hookform/resolvers': 'empty:',
-    'react-aria-menubutton': 'empty:',
-  };
-
-  var baseConfig = {
-    waitSeconds: 0,
-    logLevel: 1,
-    baseUrl: 'dist',
-    optimize: 'none',
-    mainConfigFile: 'dist/config/discovery.config.js',
-    deps: [],
-    findNestedDependencies: false,
-    create: true,
-    paths: PATHS,
-    stubModules: ['es6', 'babel'],
-  };
-
-  grunt.registerMultiTask(
-    'optimize-build',
-    'Generate config and optimize build',
-    function() {
-      var _ = require('lodash');
-      var path = require('path');
-      var fullConfig = {};
-
-      // callback called with URL and name pulled from folder
-      var getByGlob = function(globs, cb) {
-        var urls = [];
-        grunt.file.expand({ filter: 'isFile' }, globs).forEach(function(url) {
-          var parts = url.split(path.sep);
-          if (/jsx\.js$/.test(url)) {
-            url = url.replace(/^/, 'es6!');
-          }
-          url = url.replace('src/', '').replace(/\.js$/, '');
-          urls.push(url);
-          cb && cb(url, parts[3]);
-        });
-        return urls;
-      };
-
-      var writeOutConfig = function(config, done) {
-        var output = `
-        // GENERATED FILE (edits will be overwritten)
-        module.exports = ${JSON.stringify(config, null, 2)};
-      `;
-        fullConfig = config;
-        grunt.file.write(path.resolve(__dirname, 'requirejs.js'), output);
-        (function check(i) {
-          if (
-            i >= 30 ||
-            grunt.file.exists(path.resolve(__dirname, 'requirejs.js'))
-          ) {
-            grunt.log.writeln('Configuration Generated...');
-            return done();
-          }
-          setTimeout(check, 500, ++i);
-        })(0);
-      };
-
-      grunt.registerTask('generateConfig', function() {
-        var config = {};
-        var done = this.async();
-        var addConfig = function(name, cfg) {
-          config[name] = {};
-          config[name].options = _.extend(
-            {},
-            baseConfig,
-            {
-              name: `${name}.bundle`,
-              out: `dist/config/${name}.bundle.js`,
-            },
-            cfg
-          );
-        };
-
-        const globFiles = (arrOfPaths) => {
-          const filter = (path) => {
-            // filter out all es6 modules, for now
-            return !/\.jsx\.js$/.test(path);
-          };
-
-          return grunt.file
-            .expand({ cwd: 'dist', filter }, arrOfPaths)
-            .map((path) => {
-              return path.replace(/\.js$/, '');
-            });
-        };
+/* eslint-disable global-require */
 
-        addConfig('landing-page', {
-          include: [
-            ...globFiles([
-              'js/react/Recommender/**/*.js',
-              'js/widgets/paper_search_form/**/*.js',
+module.exports = function(grunt) {
+  const buildConfig = {
+    options: {
+      paths: {
+        'backbone-validation': 'empty:',
+        'backbone.stickit': 'empty:',
+        'backbone.wreqr': 'empty:',
+        backbone: 'empty:',
+        bootstrap: 'empty:',
+        bowser: 'empty:',
+        classnames: 'empty:',
+        clipboard: 'empty:',
+        'create-react-class': 'empty:',
+        'd3-cloud': 'empty:',
+        d3: 'empty:',
+        filesaver: 'empty:',
+        'google-recaptcha': 'empty:',
+        'google-analytics': 'empty:',
+        jquery: 'empty:',
+        'jquery-ui': 'empty:',
+        'jquery-querybuilder': 'empty:',
+        jsonpath: 'empty:',
+        marionette: 'empty:',
+        mathjax: 'empty:',
+        moment: 'empty:',
+        'persist-js': 'empty:',
+        'react-bootstrap': 'empty:',
+        'react-dom': 'empty:',
+        'prop-types': 'empty:',
+        'react-redux': 'empty:',
+        react: 'empty:',
+        'redux-thunk': 'empty:',
+        redux: 'empty:',
+        requirejs: 'empty:',
+        reselect: 'empty:',
+        select2: 'empty:',
+        sprintf: 'empty:',
+        underscore: 'empty:',
+        'discovery.vars': 'empty:',
+        yup: 'empty:',
+        'react-hook-form': 'empty:',
+        'react-flexview': 'empty:',
+        'styled-components': 'empty:',
+        'react-is': 'empty:',
+        'react-data-table-component': 'empty:',
+        'react-window': 'empty:',
+        'react-async': 'empty:',
+        diff: 'empty:',
+        hotkeys: 'empty:',
+        'react-transition-group': 'empty:',
+        'regenerator-runtime': 'empty:',
+        '@hookform/resolvers': 'empty:',
+        'react-aria-menubutton': 'empty:',
+      },
+      stubModules: ['es6', 'babel'],
+    },
+    release: {
+      options: {
+        bundles: {
+          'landing-page': {
+            files: [
+              'js/wraps/*_facet.js',
+              'js/widgets/metrics/**/*.js',
+              'js/widgets/list_of_things/**/*.js',
               'js/widgets/search_bar/**/*.js',
               'js/widgets/facet/**/*.js',
               'js/widgets/alerts/**/*.js',
-            ]),
-            'js/widgets/base/base_widget',
-            'js/widgets/classic_form/widget',
-            'js/widgets/footer/widget',
-            'js/widgets/navbar/widget',
-            'js/widgets/widget_states',
-            'js/wraps/alerts_mediator',
-            'js/wraps/discovery_mediator',
-            'js/wraps/landing_page_manager/landing_page_manager',
-          ],
-        });
-
-        addConfig('search-page', {
-          include: [
-            ...globFiles([
+            ],
+            requireModules: [
+              'js/widgets/abstract/widget',
+              'js/widgets/api_query/widget',
+              'js/widgets/base/base_widget',
+              'js/widgets/bubble_chart/widget',
+              'js/widgets/citation_helper/widget',
+              'js/widgets/dropdown-menu/widget',
+              'js/widgets/filter_visualizer/widget',
+              'js/widgets/footer/widget',
+              'js/widgets/navbar/widget',
+              'js/widgets/network_vis/network_widget',
+              'js/widgets/query_info/query_info_widget',
+              'js/widgets/results/widget',
+              'js/widgets/tabs/tabs_widget',
+              'js/widgets/widget_states',
+              'js/widgets/wordcloud/widget',
+              'js/wraps/alerts_mediator',
+              'js/wraps/discovery_mediator',
+              'js/wraps/export_dropdown',
+              'js/wraps/graph_tabs',
+              'js/wraps/results_page_manager',
+              'js/wraps/visualization_dropdown',
+              'libs/select2/matcher',
+            ],
+          },
+          'search-page': {
+            files: [
               'js/wraps/*_facet.js',
               'js/widgets/metrics/**/*.js',
               'js/widgets/list_of_things/**/*.js',
               'js/widgets/search_bar/**/*.js',
               'js/widgets/facet/**/*.js',
               'js/widgets/alerts/**/*.js',
-            ]),
-            'js/widgets/abstract/widget',
-            'js/widgets/api_query/widget',
-            'js/widgets/base/base_widget',
-            'js/widgets/bubble_chart/widget',
-            'js/widgets/citation_helper/widget',
-            'js/widgets/dropdown-menu/widget',
-            'js/widgets/filter_visualizer/widget',
-            'js/widgets/footer/widget',
-            'js/widgets/navbar/widget',
-            'js/widgets/network_vis/network_widget',
-            'js/widgets/query_info/query_info_widget',
-            'js/widgets/results/widget',
-            'js/widgets/tabs/tabs_widget',
-            'js/widgets/widget_states',
-            'js/widgets/wordcloud/widget',
-            'js/wraps/alerts_mediator',
-            'js/wraps/discovery_mediator',
-            'js/wraps/export_dropdown',
-            'js/wraps/graph_tabs',
-            'js/wraps/results_page_manager',
-            'js/wraps/visualization_dropdown',
-            'libs/select2/matcher',
-          ],
-        });
-
-        addConfig('abstract-page', {
-          include: [
-            ...globFiles([
+            ],
+            requireModules: [
+              'js/widgets/abstract/widget',
+              'js/widgets/api_query/widget',
+              'js/widgets/base/base_widget',
+              'js/widgets/bubble_chart/widget',
+              'js/widgets/citation_helper/widget',
+              'js/widgets/dropdown-menu/widget',
+              'js/widgets/filter_visualizer/widget',
+              'js/widgets/footer/widget',
+              'js/widgets/navbar/widget',
+              'js/widgets/network_vis/network_widget',
+              'js/widgets/query_info/query_info_widget',
+              'js/widgets/results/widget',
+              'js/widgets/tabs/tabs_widget',
+              'js/widgets/widget_states',
+              'js/widgets/wordcloud/widget',
+              'js/wraps/alerts_mediator',
+              'js/wraps/discovery_mediator',
+              'js/wraps/export_dropdown',
+              'js/wraps/graph_tabs',
+              'js/wraps/results_page_manager',
+              'js/wraps/visualization_dropdown',
+              'libs/select2/matcher',
+            ],
+          },
+          'abstract-page': {
+            files: [
               'js/wraps/*_facet.js',
               'js/widgets/metrics/**/*.js',
               'js/widgets/list_of_things/**/*.js',
               'js/widgets/search_bar/**/*.js',
               'js/widgets/facet/**/*.js',
               'js/widgets/alerts/**/*.js',
-            ]),
-            'js/widgets/abstract/widget',
-            'js/widgets/base/base_widget',
-            'js/widgets/footer/widget',
-            'js/widgets/graphics/widget',
-            'js/widgets/meta_tags/widget',
-            'js/widgets/navbar/widget',
-            'js/widgets/query_info/query_info_widget',
-            'js/widgets/widget_states',
-            'js/wraps/abstract_page_library_add/widget',
-            'js/wraps/abstract_page_manager/abstract_page_manager',
-            'js/wraps/alerts_mediator',
-            'js/wraps/citations',
-            'js/wraps/coreads',
-            'js/wraps/discovery_mediator',
-            'js/wraps/paper_export',
-            'js/wraps/paper_metrics',
-            'js/wraps/references',
-            'js/wraps/sidebar-graphics-widget',
-            'js/wraps/table_of_contents',
-            'libs/select2/matcher',
-          ],
-        });
-
-        addConfig('main', {
-          include: [
-            ...globFiles([
+            ],
+            requireModules: [
+              'js/widgets/abstract/widget',
+              'js/widgets/base/base_widget',
+              'js/widgets/footer/widget',
+              'js/widgets/graphics/widget',
+              'js/widgets/meta_tags/widget',
+              'js/widgets/navbar/widget',
+              'js/widgets/query_info/query_info_widget',
+              'js/widgets/widget_states',
+              'js/wraps/abstract_page_library_add/widget',
+              'js/wraps/abstract_page_manager/abstract_page_manager',
+              'js/wraps/alerts_mediator',
+              'js/wraps/citations',
+              'js/wraps/coreads',
+              'js/wraps/discovery_mediator',
+              'js/wraps/paper_export',
+              'js/wraps/paper_metrics',
+              'js/wraps/references',
+              'js/wraps/sidebar-graphics-widget',
+              'js/wraps/table_of_contents',
+              'libs/select2/matcher',
+            ],
+          },
+          main: {
+            files: [
               'config/**/*.js',
               '!config/discovery.vars.js',
               '!config/shim.js',
@@ -238,65 +173,174 @@ module.exports = function(grunt) {
               'js/modules/**/*.js',
               'js/page_managers/**/*.js',
               'js/services/**/*.js',
-            ]),
-            'analytics',
-            'router',
-            'utils',
-            'recaptcha',
-            'reactify',
-            'js/bugutils/diagnostics',
-            'js/react/BumblebeeWidget',
+            ],
+            requireModules: [
+              'analytics',
+              'router',
+              'utils',
+              'recaptcha',
+              'reactify',
+              'js/bugutils/diagnostics',
+              'js/react/BumblebeeWidget',
+              'js/dark-mode-switch',
 
-            // vendor libraries
-            'cache',
-            'hbs',
-            'async',
-            'hbs/handlebars',
-            'hbs/json2',
-            'hbs/underscore',
-            'array-flat-polyfill',
-            'regenerator-runtime',
-            'hotkeys',
-            'react-transition-group',
-            '@hookform/resolvers',
-          ],
+              // vendor libraries
+              'cache',
+              'hbs',
+              'async',
+              'hbs/handlebars',
+              'hbs/json2',
+              'hbs/underscore',
+              'array-flat-polyfill',
+              'regenerator-runtime',
+              'hotkeys',
+              'react-transition-group',
+              '@hookform/resolvers',
+            ],
+          },
+        },
+      },
+    },
+  };
+
+  grunt.registerMultiTask(
+    'optimize-build',
+    'Generate config and optimize build',
+    function() {
+      const _ = require('lodash');
+      const rjs = require('requirejs');
+      const fullConfig = {};
+      const options = this.options({
+        waitSeconds: 7,
+        logLevel: 4,
+        baseUrl: 'dist',
+        optimize: 'none',
+        mainConfigFile: 'dist/config/discovery.config.js',
+        deps: [],
+        findNestedDependencies: false,
+        create: true,
+        bundles: {},
+      });
+
+      const { bundles, ...baseConfig } = options;
+
+      // fail here if no bundles are passed
+      if (Object.keys(options.bundles).length === 0) {
+        return grunt.fail.fatal('No bundles configured');
+      }
+
+      /**
+       * Generate the bundles based on the passed in config
+       */
+      grunt.registerTask('generateBundles', function() {
+        const done = this.async();
+
+        // log out a message on each successful completion
+        const onBundleComplete = ({ name }) => {
+          grunt.log.ok(`${name} generated!`);
+        };
+
+        // generate the config based on the base and bundle name
+        const getConfig = (name, cfg) => ({
+          ...baseConfig,
+          name: `${name}.bundle`,
+          out: `dist/config/${name}.bundle.js`,
+          onModuleBundleComplete: onBundleComplete,
+          ...cfg,
         });
 
-        writeOutConfig(config, done);
+        // expand file globs
+        const expand = ({ files, requireModules }) => {
+          const filter = (path) => {
+            // filter out all es6 modules, for now
+            return !/\.jsx\.js$/.test(path);
+          };
+
+          const paths = grunt.file
+            .expand({ cwd: 'dist', filter }, files)
+            .map((path) => {
+              return path.replace(/\.js$/, '');
+            });
+
+          return [...paths, ...requireModules];
+        };
+
+        // wraps requirejs optimizer in promise
+        const optimize = (name, modules) =>
+          new Promise((res, rej) => {
+            const config = getConfig(name, { include: modules });
+
+            // update fullConfig variable (used in other task)
+            fullConfig[name] = config;
+
+            // call optimize on the configuration, passing in our promise handlers
+            rjs.optimize(
+              config,
+              () => res(),
+              (args) => rej(args)
+            );
+          });
+
+        const promises = [];
+        Object.keys(bundles).forEach((name) =>
+          promises.push(optimize(name, expand(bundles[name])))
+        );
+
+        // wait on all the promises to finish, otherwise fail here
+        Promise.all(promises)
+          .catch((err) => grunt.fail.fatal(err))
+          .finally(() => done());
       });
 
-      var getDiscoveryConfig = function() {
-        var content = grunt.file.read('dist/config/discovery.config.js');
-        var cfg = {};
+      const getDiscoveryConfig = function() {
+        const content = grunt.file.read('dist/config/discovery.config.js', {
+          encoding: 'utf-8',
+        });
+        let cfg = {};
         (function() {
-          var require = (requirejs = {
-            config: function(data) {
+          // mocks "require" in context for the eval call, this allows us to extract the config
+          // eslint-disable-next-line no-unused-vars
+          const require = {
+            config(data) {
               cfg = data;
             },
-          });
+          };
+
+          // eslint-disable-next-line no-eval
           eval(content.toString());
         })();
+
         return cfg;
       };
 
-      var generateConfigFileString = function(name, cnts) {
-        return `
+      const generateConfigFileString = (name, contents) =>
+        Buffer.from(
+          `
 /**
  * GENERATED FILE (edits will be overwritten):
  * This is the configuration for ${name}.
  */
-requirejs.config(${JSON.stringify(cnts, null, 2)});
-`;
-      };
+requirejs.config(${JSON.stringify(contents)});
+`,
+          'utf-8'
+        );
+
+      /**
+       * Generates the requirejs configs based on a default one which we grab first
+       *
+       * Basically we generate bundles above, which now need to be the target of several paths.  In
+       * these generated configs, we point to our bundle (if necessary) otherwise leave it be.
+       */
+      grunt.registerTask('generateConfigs', function() {
+        const cfg = getDiscoveryConfig();
 
-      grunt.registerTask('applyIncludesToConfig', function() {
-        var cfg = getDiscoveryConfig();
+        console.log(fullConfig);
 
         // generate the rest of the bundles
-        _.forEach(fullConfig, function(bundle, name) {
-          var _cfg = _.extend({}, cfg, {
+        _.forEach(fullConfig, function({ name, include }, moduleName) {
+          const _cfg = _.extend({}, cfg, {
             // set the main dependency to the bundle name
-            deps: [`config/${bundle.options.name}`],
+            deps: [`config/${name}`],
 
             // update the paths config with new revved names
             paths: _.extend(
@@ -305,35 +349,30 @@ requirejs.config(${JSON.stringify(cnts, null, 2)});
 
               // add all additional revved filenames to the paths
               _.reduce(
-                bundle.options.include,
-                function(acc, p) {
-                  acc[p] = `config/${bundle.options.name}`;
-                  return acc;
-                },
+                include,
+                (acc, k) => ({ ...acc, [k]: `config/${name}` }),
                 {}
               ),
 
               // some explicit path changes
               {
-                'discovery.config': `config/${bundle.options.name}`,
+                'discovery.config': `config/${name}`,
               }
             ),
           });
 
-          var out = generateConfigFileString(`dist/${name}.config.js`, _cfg);
-          grunt.file.write(`dist/config/${name}.config.js`, out);
-          grunt.log.writeln(`${name}.config.js has been created`);
+          const out = generateConfigFileString(
+            `dist/${moduleName}.config.js`,
+            _cfg
+          );
+          grunt.file.write(`dist/config/${moduleName}.config.js`, out);
+          grunt.log.writeln(`${moduleName}.config.js has been created`);
         });
       });
 
-      grunt.task.run(['generateConfig', 'babel:release', 'requirejs']);
-      grunt.task.run(['applyIncludesToConfig']);
-      // grunt.task.run(['uglify']);
+      grunt.task.run(['babel:release', 'generateBundles', 'generateConfigs']);
     }
   );
 
-  return {
-    options: {},
-    release: {},
-  };
+  return buildConfig;
 };
diff --git a/grunt/requirejs.js b/grunt/requirejs.js
deleted file mode 100644
index 148c8a48b..000000000
--- a/grunt/requirejs.js
+++ /dev/null
@@ -1,538 +0,0 @@
-
-        // GENERATED FILE (edits will be overwritten)
-        module.exports = {
-  "landing-page": {
-    "options": {
-      "waitSeconds": 0,
-      "logLevel": 1,
-      "baseUrl": "dist",
-      "optimize": "none",
-      "mainConfigFile": "dist/config/discovery.config.js",
-      "deps": [],
-      "findNestedDependencies": false,
-      "create": true,
-      "paths": {
-        "backbone-validation": "empty:",
-        "backbone.stickit": "empty:",
-        "backbone.wreqr": "empty:",
-        "backbone": "empty:",
-        "bootstrap": "empty:",
-        "bowser": "empty:",
-        "classnames": "empty:",
-        "clipboard": "empty:",
-        "create-react-class": "empty:",
-        "d3-cloud": "empty:",
-        "d3": "empty:",
-        "filesaver": "empty:",
-        "google-recaptcha": "empty:",
-        "google-analytics": "empty:",
-        "jquery": "empty:",
-        "jquery-ui": "empty:",
-        "jquery-querybuilder": "empty:",
-        "jsonpath": "empty:",
-        "marionette": "empty:",
-        "mathjax": "empty:",
-        "moment": "empty:",
-        "persist-js": "empty:",
-        "react-bootstrap": "empty:",
-        "react-dom": "empty:",
-        "prop-types": "empty:",
-        "react-redux": "empty:",
-        "react": "empty:",
-        "redux-thunk": "empty:",
-        "redux": "empty:",
-        "requirejs": "empty:",
-        "reselect": "empty:",
-        "select2": "empty:",
-        "sprintf": "empty:",
-        "underscore": "empty:",
-        "discovery.vars": "empty:",
-        "yup": "empty:",
-        "react-hook-form": "empty:",
-        "react-flexview": "empty:",
-        "styled-components": "empty:",
-        "react-is": "empty:",
-        "react-data-table-component": "empty:",
-        "react-window": "empty:",
-        "react-async": "empty:",
-        "diff": "empty:",
-        "hotkeys": "empty:",
-        "react-transition-group": "empty:",
-        "regenerator-runtime": "empty:",
-        "@hookform/resolvers": "empty:",
-        "react-aria-menubutton": "empty:"
-      },
-      "stubModules": [
-        "es6",
-        "babel"
-      ],
-      "name": "landing-page.bundle",
-      "out": "dist/config/landing-page.bundle.js",
-      "include": [
-        "js/react/Recommender/actions",
-        "js/react/Recommender/containers/main",
-        "js/react/Recommender/index",
-        "js/react/Recommender/middleware",
-        "js/react/Recommender/models/index",
-        "js/react/Recommender/models/searchExamples",
-        "js/react/Recommender/reducer",
-        "js/widgets/paper_search_form/topterms",
-        "js/widgets/paper_search_form/widget",
-        "js/widgets/search_bar/autocomplete",
-        "js/widgets/search_bar/quick-field-desc",
-        "js/widgets/search_bar/search_bar_widget",
-        "js/widgets/facet/actions",
-        "js/widgets/facet/create_store",
-        "js/widgets/facet/factory",
-        "js/widgets/facet/graph-facet/base_graph",
-        "js/widgets/facet/graph-facet/h_index_graph",
-        "js/widgets/facet/graph-facet/widget",
-        "js/widgets/facet/graph-facet/year_graph",
-        "js/widgets/facet/reducers",
-        "js/widgets/facet/widget",
-        "js/widgets/alerts/modal_view",
-        "js/widgets/alerts/page_top_alert",
-        "js/widgets/alerts/widget",
-        "js/widgets/base/base_widget",
-        "js/widgets/classic_form/widget",
-        "js/widgets/footer/widget",
-        "js/widgets/navbar/widget",
-        "js/widgets/widget_states",
-        "js/wraps/alerts_mediator",
-        "js/wraps/discovery_mediator",
-        "js/wraps/landing_page_manager/landing_page_manager"
-      ]
-    }
-  },
-  "search-page": {
-    "options": {
-      "waitSeconds": 0,
-      "logLevel": 1,
-      "baseUrl": "dist",
-      "optimize": "none",
-      "mainConfigFile": "dist/config/discovery.config.js",
-      "deps": [],
-      "findNestedDependencies": false,
-      "create": true,
-      "paths": {
-        "backbone-validation": "empty:",
-        "backbone.stickit": "empty:",
-        "backbone.wreqr": "empty:",
-        "backbone": "empty:",
-        "bootstrap": "empty:",
-        "bowser": "empty:",
-        "classnames": "empty:",
-        "clipboard": "empty:",
-        "create-react-class": "empty:",
-        "d3-cloud": "empty:",
-        "d3": "empty:",
-        "filesaver": "empty:",
-        "google-recaptcha": "empty:",
-        "google-analytics": "empty:",
-        "jquery": "empty:",
-        "jquery-ui": "empty:",
-        "jquery-querybuilder": "empty:",
-        "jsonpath": "empty:",
-        "marionette": "empty:",
-        "mathjax": "empty:",
-        "moment": "empty:",
-        "persist-js": "empty:",
-        "react-bootstrap": "empty:",
-        "react-dom": "empty:",
-        "prop-types": "empty:",
-        "react-redux": "empty:",
-        "react": "empty:",
-        "redux-thunk": "empty:",
-        "redux": "empty:",
-        "requirejs": "empty:",
-        "reselect": "empty:",
-        "select2": "empty:",
-        "sprintf": "empty:",
-        "underscore": "empty:",
-        "discovery.vars": "empty:",
-        "yup": "empty:",
-        "react-hook-form": "empty:",
-        "react-flexview": "empty:",
-        "styled-components": "empty:",
-        "react-is": "empty:",
-        "react-data-table-component": "empty:",
-        "react-window": "empty:",
-        "react-async": "empty:",
-        "diff": "empty:",
-        "hotkeys": "empty:",
-        "react-transition-group": "empty:",
-        "regenerator-runtime": "empty:",
-        "@hookform/resolvers": "empty:",
-        "react-aria-menubutton": "empty:"
-      },
-      "stubModules": [
-        "es6",
-        "babel"
-      ],
-      "name": "search-page.bundle",
-      "out": "dist/config/search-page.bundle.js",
-      "include": [
-        "js/wraps/affiliation_facet",
-        "js/wraps/author_facet",
-        "js/wraps/bibgroup_facet",
-        "js/wraps/bibstem_facet",
-        "js/wraps/data_facet",
-        "js/wraps/database_facet",
-        "js/wraps/grants_facet",
-        "js/wraps/keyword_facet",
-        "js/wraps/ned_object_facet",
-        "js/wraps/pubtype_facet",
-        "js/wraps/refereed_facet",
-        "js/wraps/simbad_object_facet",
-        "js/wraps/vizier_facet",
-        "js/widgets/metrics/d3-tip",
-        "js/widgets/metrics/extractor_functions",
-        "js/widgets/metrics/widget",
-        "js/widgets/list_of_things/details_widget",
-        "js/widgets/list_of_things/infinite_view",
-        "js/widgets/list_of_things/item_view",
-        "js/widgets/list_of_things/model",
-        "js/widgets/list_of_things/paginated_view",
-        "js/widgets/list_of_things/widget",
-        "js/widgets/search_bar/autocomplete",
-        "js/widgets/search_bar/quick-field-desc",
-        "js/widgets/search_bar/search_bar_widget",
-        "js/widgets/facet/actions",
-        "js/widgets/facet/create_store",
-        "js/widgets/facet/factory",
-        "js/widgets/facet/graph-facet/base_graph",
-        "js/widgets/facet/graph-facet/h_index_graph",
-        "js/widgets/facet/graph-facet/widget",
-        "js/widgets/facet/graph-facet/year_graph",
-        "js/widgets/facet/reducers",
-        "js/widgets/facet/widget",
-        "js/widgets/alerts/modal_view",
-        "js/widgets/alerts/page_top_alert",
-        "js/widgets/alerts/widget",
-        "js/widgets/abstract/widget",
-        "js/widgets/api_query/widget",
-        "js/widgets/base/base_widget",
-        "js/widgets/bubble_chart/widget",
-        "js/widgets/citation_helper/widget",
-        "js/widgets/dropdown-menu/widget",
-        "js/widgets/filter_visualizer/widget",
-        "js/widgets/footer/widget",
-        "js/widgets/navbar/widget",
-        "js/widgets/network_vis/network_widget",
-        "js/widgets/query_info/query_info_widget",
-        "js/widgets/results/widget",
-        "js/widgets/tabs/tabs_widget",
-        "js/widgets/widget_states",
-        "js/widgets/wordcloud/widget",
-        "js/wraps/alerts_mediator",
-        "js/wraps/discovery_mediator",
-        "js/wraps/export_dropdown",
-        "js/wraps/graph_tabs",
-        "js/wraps/results_page_manager",
-        "js/wraps/visualization_dropdown",
-        "libs/select2/matcher"
-      ]
-    }
-  },
-  "abstract-page": {
-    "options": {
-      "waitSeconds": 0,
-      "logLevel": 1,
-      "baseUrl": "dist",
-      "optimize": "none",
-      "mainConfigFile": "dist/config/discovery.config.js",
-      "deps": [],
-      "findNestedDependencies": false,
-      "create": true,
-      "paths": {
-        "backbone-validation": "empty:",
-        "backbone.stickit": "empty:",
-        "backbone.wreqr": "empty:",
-        "backbone": "empty:",
-        "bootstrap": "empty:",
-        "bowser": "empty:",
-        "classnames": "empty:",
-        "clipboard": "empty:",
-        "create-react-class": "empty:",
-        "d3-cloud": "empty:",
-        "d3": "empty:",
-        "filesaver": "empty:",
-        "google-recaptcha": "empty:",
-        "google-analytics": "empty:",
-        "jquery": "empty:",
-        "jquery-ui": "empty:",
-        "jquery-querybuilder": "empty:",
-        "jsonpath": "empty:",
-        "marionette": "empty:",
-        "mathjax": "empty:",
-        "moment": "empty:",
-        "persist-js": "empty:",
-        "react-bootstrap": "empty:",
-        "react-dom": "empty:",
-        "prop-types": "empty:",
-        "react-redux": "empty:",
-        "react": "empty:",
-        "redux-thunk": "empty:",
-        "redux": "empty:",
-        "requirejs": "empty:",
-        "reselect": "empty:",
-        "select2": "empty:",
-        "sprintf": "empty:",
-        "underscore": "empty:",
-        "discovery.vars": "empty:",
-        "yup": "empty:",
-        "react-hook-form": "empty:",
-        "react-flexview": "empty:",
-        "styled-components": "empty:",
-        "react-is": "empty:",
-        "react-data-table-component": "empty:",
-        "react-window": "empty:",
-        "react-async": "empty:",
-        "diff": "empty:",
-        "hotkeys": "empty:",
-        "react-transition-group": "empty:",
-        "regenerator-runtime": "empty:",
-        "@hookform/resolvers": "empty:",
-        "react-aria-menubutton": "empty:"
-      },
-      "stubModules": [
-        "es6",
-        "babel"
-      ],
-      "name": "abstract-page.bundle",
-      "out": "dist/config/abstract-page.bundle.js",
-      "include": [
-        "js/wraps/affiliation_facet",
-        "js/wraps/author_facet",
-        "js/wraps/bibgroup_facet",
-        "js/wraps/bibstem_facet",
-        "js/wraps/data_facet",
-        "js/wraps/database_facet",
-        "js/wraps/grants_facet",
-        "js/wraps/keyword_facet",
-        "js/wraps/ned_object_facet",
-        "js/wraps/pubtype_facet",
-        "js/wraps/refereed_facet",
-        "js/wraps/simbad_object_facet",
-        "js/wraps/vizier_facet",
-        "js/widgets/metrics/d3-tip",
-        "js/widgets/metrics/extractor_functions",
-        "js/widgets/metrics/widget",
-        "js/widgets/list_of_things/details_widget",
-        "js/widgets/list_of_things/infinite_view",
-        "js/widgets/list_of_things/item_view",
-        "js/widgets/list_of_things/model",
-        "js/widgets/list_of_things/paginated_view",
-        "js/widgets/list_of_things/widget",
-        "js/widgets/search_bar/autocomplete",
-        "js/widgets/search_bar/quick-field-desc",
-        "js/widgets/search_bar/search_bar_widget",
-        "js/widgets/facet/actions",
-        "js/widgets/facet/create_store",
-        "js/widgets/facet/factory",
-        "js/widgets/facet/graph-facet/base_graph",
-        "js/widgets/facet/graph-facet/h_index_graph",
-        "js/widgets/facet/graph-facet/widget",
-        "js/widgets/facet/graph-facet/year_graph",
-        "js/widgets/facet/reducers",
-        "js/widgets/facet/widget",
-        "js/widgets/alerts/modal_view",
-        "js/widgets/alerts/page_top_alert",
-        "js/widgets/alerts/widget",
-        "js/widgets/abstract/widget",
-        "js/widgets/base/base_widget",
-        "js/widgets/footer/widget",
-        "js/widgets/graphics/widget",
-        "js/widgets/meta_tags/widget",
-        "js/widgets/navbar/widget",
-        "js/widgets/query_info/query_info_widget",
-        "js/widgets/widget_states",
-        "js/wraps/abstract_page_library_add/widget",
-        "js/wraps/abstract_page_manager/abstract_page_manager",
-        "js/wraps/alerts_mediator",
-        "js/wraps/citations",
-        "js/wraps/coreads",
-        "js/wraps/discovery_mediator",
-        "js/wraps/paper_export",
-        "js/wraps/paper_metrics",
-        "js/wraps/references",
-        "js/wraps/sidebar-graphics-widget",
-        "js/wraps/table_of_contents",
-        "libs/select2/matcher"
-      ]
-    }
-  },
-  "main": {
-    "options": {
-      "waitSeconds": 0,
-      "logLevel": 1,
-      "baseUrl": "dist",
-      "optimize": "none",
-      "mainConfigFile": "dist/config/discovery.config.js",
-      "deps": [],
-      "findNestedDependencies": false,
-      "create": true,
-      "paths": {
-        "backbone-validation": "empty:",
-        "backbone.stickit": "empty:",
-        "backbone.wreqr": "empty:",
-        "backbone": "empty:",
-        "bootstrap": "empty:",
-        "bowser": "empty:",
-        "classnames": "empty:",
-        "clipboard": "empty:",
-        "create-react-class": "empty:",
-        "d3-cloud": "empty:",
-        "d3": "empty:",
-        "filesaver": "empty:",
-        "google-recaptcha": "empty:",
-        "google-analytics": "empty:",
-        "jquery": "empty:",
-        "jquery-ui": "empty:",
-        "jquery-querybuilder": "empty:",
-        "jsonpath": "empty:",
-        "marionette": "empty:",
-        "mathjax": "empty:",
-        "moment": "empty:",
-        "persist-js": "empty:",
-        "react-bootstrap": "empty:",
-        "react-dom": "empty:",
-        "prop-types": "empty:",
-        "react-redux": "empty:",
-        "react": "empty:",
-        "redux-thunk": "empty:",
-        "redux": "empty:",
-        "requirejs": "empty:",
-        "reselect": "empty:",
-        "select2": "empty:",
-        "sprintf": "empty:",
-        "underscore": "empty:",
-        "discovery.vars": "empty:",
-        "yup": "empty:",
-        "react-hook-form": "empty:",
-        "react-flexview": "empty:",
-        "styled-components": "empty:",
-        "react-is": "empty:",
-        "react-data-table-component": "empty:",
-        "react-window": "empty:",
-        "react-async": "empty:",
-        "diff": "empty:",
-        "hotkeys": "empty:",
-        "react-transition-group": "empty:",
-        "regenerator-runtime": "empty:",
-        "@hookform/resolvers": "empty:",
-        "react-aria-menubutton": "empty:"
-      },
-      "stubModules": [
-        "es6",
-        "babel"
-      ],
-      "name": "main.bundle",
-      "out": "dist/config/main.bundle.js",
-      "include": [
-        "config/common.config",
-        "config/discovery.config",
-        "js/apps/discovery/main",
-        "js/apps/discovery/navigator",
-        "js/components/alerts",
-        "js/components/alerts_mediator",
-        "js/components/api_feedback",
-        "js/components/api_query",
-        "js/components/api_query_updater",
-        "js/components/api_request",
-        "js/components/api_request_queue",
-        "js/components/api_response",
-        "js/components/api_targets",
-        "js/components/app_storage",
-        "js/components/application",
-        "js/components/beehive",
-        "js/components/csrf_manager",
-        "js/components/default_request",
-        "js/components/doc_stash_controller",
-        "js/components/experiments",
-        "js/components/facade",
-        "js/components/feedback_mediator",
-        "js/components/generic_module",
-        "js/components/history_manager",
-        "js/components/hotkeys_controller",
-        "js/components/json_response",
-        "js/components/library_controller",
-        "js/components/multi_params",
-        "js/components/navigator",
-        "js/components/paginator",
-        "js/components/persistent_storage",
-        "js/components/pubsub_events",
-        "js/components/pubsub_key",
-        "js/components/query_mediator",
-        "js/components/query_validator",
-        "js/components/recaptcha_manager",
-        "js/components/second_order_controller",
-        "js/components/services_container",
-        "js/components/session",
-        "js/components/solr_params",
-        "js/components/solr_response",
-        "js/components/transition",
-        "js/components/transition_catalog",
-        "js/components/user",
-        "js/mixins/add_secondary_sort",
-        "js/mixins/add_stable_index_to_collection",
-        "js/mixins/api_access",
-        "js/mixins/dependon",
-        "js/mixins/discovery_bootstrap",
-        "js/mixins/expose_metadata",
-        "js/mixins/form_view_functions",
-        "js/mixins/formatter",
-        "js/mixins/hardened",
-        "js/mixins/link_generator_mixin",
-        "js/mixins/openurl_generator",
-        "js/mixins/papers_utils",
-        "js/mixins/side_bar_manager",
-        "js/mixins/user_change_rows",
-        "js/mixins/widget_mixin_method",
-        "js/mixins/widget_pagination",
-        "js/mixins/widget_state_handling",
-        "js/mixins/widget_state_manager",
-        "js/mixins/widget_utility",
-        "js/modules/hello",
-        "js/modules/orcid/bio",
-        "js/modules/orcid/extension",
-        "js/modules/orcid/item_view_extension",
-        "js/modules/orcid/module",
-        "js/modules/orcid/orcid_api",
-        "js/modules/orcid/profile",
-        "js/modules/orcid/widget/widget",
-        "js/modules/orcid/work",
-        "js/page_managers/controller",
-        "js/page_managers/master",
-        "js/page_managers/one_column_view",
-        "js/page_managers/three_column_view",
-        "js/page_managers/toc_controller",
-        "js/page_managers/toc_widget",
-        "js/page_managers/view_mixin",
-        "js/services/api",
-        "js/services/default_pubsub",
-        "js/services/pubsub",
-        "js/services/storage",
-        "analytics",
-        "router",
-        "utils",
-        "recaptcha",
-        "reactify",
-        "js/bugutils/diagnostics",
-        "js/react/BumblebeeWidget",
-        "cache",
-        "hbs",
-        "async",
-        "hbs/handlebars",
-        "hbs/json2",
-        "hbs/underscore",
-        "array-flat-polyfill",
-        "regenerator-runtime",
-        "hotkeys",
-        "react-transition-group",
-        "@hookform/resolvers"
-      ]
-    }
-  }
-};
-      
\ No newline at end of file
diff --git a/src/404.html b/src/404.html
index 323b4c7bd..91d928a40 100644
--- a/src/404.html
+++ b/src/404.html
@@ -3,13 +3,8 @@
   <head>
     <link rel="preload" href="./styles/css/styles.css" as="style" />
     <link rel="stylesheet" href="./styles/css/styles.css" />
-    <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
-    <script>
-      !window.requirejs &&
-        document.write(
-          '<script src="./libs/requirejs/require.js">\x3C/script>'
-        );
-    </script>
+    <link rel="preload" href="./libs/require.js" as="script" />
+    <script src="./libs/require.js"></script>
     <script>
       require.config({
         paths: {
diff --git a/src/500.html b/src/500.html
index ff7f4636a..c69f5e241 100644
--- a/src/500.html
+++ b/src/500.html
@@ -2,13 +2,9 @@
 <html>
   <head>
     <link rel="preload" href="./styles/css/styles.css" as="style" />
-    <link
-      rel="preload"
-      href="//cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"
-      as="script"
-    />
+    <link rel="preload" href="./libs/require.js" as="script" />
     <link rel="stylesheet" href="./styles/css/styles.css" />
-    <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
+    <script src="./libs/require.js"></script>
     <script>
       !window.requirejs &&
         document.write(
diff --git a/src/config/common.config.js b/src/config/common.config.js
index 57ba8fc25..1d8ba4336 100644
--- a/src/config/common.config.js
+++ b/src/config/common.config.js
@@ -47,7 +47,7 @@ define([], function() {
     'regenerator-runtime',
     'array-flat-polyfill',
     'polyfill',
-    'darkMode',
+    'js/dark-mode-switch',
   ], function(config) {
     // rca: not sure why the ganalytics is loaded here instead of inside analytics.js
     //      perhaps it is because it is much/little sooner this way?
diff --git a/src/config/discovery.config.js b/src/config/discovery.config.js
index a02f9917a..c0f6655cc 100644
--- a/src/config/discovery.config.js
+++ b/src/config/discovery.config.js
@@ -176,7 +176,6 @@ require.config({
     router: 'js/apps/discovery/router',
     analytics: 'js/components/analytics',
     utils: 'js/utils',
-    darkMode: 'js/dark-mode-switch',
     recaptcha: 'js/plugins/recaptcha',
     reactify: 'js/plugins/reactify',
     es6: 'js/plugins/es6',
@@ -199,158 +198,199 @@ require.config({
     // *******************************
     // *** production dependencies ***
     // *******************************
+
     underscore: [
-      // 'https://unpkg.com/lodash@2.4.2/dist/lodash.compat.min',
+      'https://cdn.jsdelivr.net/npm/lodash@2.4.2/dist/lodash.compat.min',
+      'https://unpkg.com/lodash@2.4.2/dist/lodash.compat.min',
       'libs/lodash',
     ],
     backbone: [
       'https://cdn.jsdelivr.net/npm/backbone@1.1.2/backbone-min',
+      'https://unpkg.com/backbone@1.1.2/backbone-min',
       'libs/backbone',
     ],
     'backbone-validation': [
-      // 'https://unpkg.com/backbone-validation@0.11.3/dist/backbone-validation-amd-min',
+      'https://cdn.jsdelivr.net/npm/backbone-validation@0.11.3/dist/backbone-validation-amd-min',
+      'https://unpkg.com/backbone-validation@0.11.3/dist/backbone-validation-amd-min',
       'libs/backbone-validation',
     ],
     'backbone.stickit': [
-      // 'https://unpkg.com/backbone.stickit@0.9.2/backbone.stickit',
+      'https://cdn.jsdelivr.net/npm/backbone.stickit@0.9.2/backbone.stickit',
+      'https://unpkg.com/backbone.stickit@0.9.2/backbone.stickit',
       'libs/backbone.stickit',
     ],
     'backbone.wreqr': [
-      // 'https://unpkg.com/backbone.wreqr@1.4.0/lib/backbone.wreqr.min',
+      'https://cdn.jsdelivr.net/npm/backbone.wreqr@1.4.0/lib/backbone.wreqr.min',
+      'https://unpkg.com/backbone.wreqr@1.4.0/lib/backbone.wreqr.min',
       'libs/backbone.wreqr',
     ],
     bootstrap: [
-      // 'https://unpkg.com/bootstrap@3.3.7/dist/js/bootstrap.min',
+      'https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min',
+      'https://unpkg.com/bootstrap@3.3.7/dist/js/bootstrap.min',
       'libs/bootstrap/bootstrap',
     ],
     bowser: [
-      // 'https://unpkg.com/bowser@2.11.0/es5',
+      'https://cdn.jsdelivr.net/npm/bowser@2.11.0/es5',
+      'https://unpkg.com/bowser@2.11.0/es5',
       'libs/bowser',
     ],
     clipboard: [
-      // 'https://unpkg.com/clipboard@1.7.1/dist/clipboard.min',
+      'https://cdn.jsdelivr.net/npm/clipboard@1.7.1/dist/clipboard.min',
+      'https://unpkg.com/clipboard@1.7.1/dist/clipboard.min',
       'libs/clipboard',
     ],
     d3: [
-      // 'https://unpkg.com/d3@3.5.17/d3.min',
+      'https://cdn.jsdelivr.net/npm/d3@3.5.17/d3.min',
+      'https://unpkg.com/d3@3.5.17/d3.min',
       'libs/d3',
     ],
     'd3-cloud': [
-      // 'https://unpkg.com/d3-cloud@1.2.5/build/d3.layout.cloud',
+      'https://cdn.jsdelivr.net/npm/d3-cloud@1.2.5/build/d3.layout.cloud',
+      'https://unpkg.com/d3-cloud@1.2.5/build/d3.layout.cloud',
       'libs/d3-cloud',
     ],
     filesaver: [
-      // 'https://unpkg.com/file-saver@1.3.8/FileSaver.min',
+      'https://cdn.jsdelivr.net/npm/file-saver@1.3.8/FileSaver.min',
+      'https://unpkg.com/file-saver@1.3.8/FileSaver.min',
       'libs/file-saver',
     ],
     hotkeys: [
-      // 'https://unpkg.com/hotkeys-js@3.8.7/dist/hotkeys.min',
+      'https://cdn.jsdelivr.net/npm/hotkeys-js@3.8.7/dist/hotkeys.min',
+      'https://unpkg.com/hotkeys-js@3.8.7/dist/hotkeys.min',
       'libs/hotkeys',
     ],
     jquery: [
-      // 'https://unpkg.com/jquery@2.2.4/dist/jquery.min',
+      'https://cdn.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min',
+      'https://unpkg.com/jquery@2.2.4/dist/jquery.min',
       'libs/jquery',
     ],
     'jquery-ui': [
+      'https://code.jquery.com/ui/1.12.1/jquery-ui.min',
       'https://code.jquery.com/ui/1.12.1/jquery-ui.min',
       'libs/jquery-ui',
     ],
     jsonpath: [
-      // 'https://unpkg.com/jsonpath@0.2.12/jsonpath.min',
+      'https://cdn.jsdelivr.net/npm/jsonpath@0.2.12/jsonpath.min',
+      'https://unpkg.com/jsonpath@0.2.12/jsonpath.min',
       'libs/jsonpath',
     ],
     marionette: [
-      // 'https://unpkg.com/backbone.marionette@2.4.5/lib/backbone.marionette.min',
+      'https://cdn.jsdelivr.net/npm/backbone.marionette@2.4.5/lib/backbone.marionette.min',
+      'https://unpkg.com/backbone.marionette@2.4.5/lib/backbone.marionette.min',
       'libs/backbone.marionette',
     ],
     mathjax: [
+      'https://cdn.jsdelivr.net/npm/mathjax@2.7.4/MathJax.js?config=TeX-AMS_HTML&amp;delayStartupUntil=configured',
       'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-AMS_HTML&amp;delayStartupUntil=configured',
       'libs/mathjax/mathjax',
     ],
     moment: [
-      // 'https://unpkg.com/moment@2.22.2/min/moment.min',
+      'https://cdn.jsdelivr.net/npm/moment@2.22.2/min/moment.min',
+      'https://unpkg.com/moment@2.22.2/min/moment.min',
       'libs/moment',
     ],
     'persist-js': [
-      // 'https://unpkg.com/persist-js@0.3.1/persist-min',
+      'https://cdn.jsdelivr.net/npm/persist-js@0.3.1/persist-min',
+      'https://unpkg.com/persist-js@0.3.1/persist-min',
       'libs/persist-js',
     ],
     react: [
-      // 'https://unpkg.com/react@16/umd/react.development',
+      'https://cdn.jsdelivr.net/npm/react@16/umd/react.development',
+      'https://unpkg.com/react@16/umd/react.development',
       'libs/react',
     ],
     'react-bootstrap': [
-      // 'https://unpkg.com/react-bootstrap@0.33.0/dist/react-bootstrap.min',
+      'https://cdn.jsdelivr.net/npm/react-bootstrap@0.33.0/dist/react-bootstrap.min',
+      'https://unpkg.com/react-bootstrap@0.33.0/dist/react-bootstrap.min',
       'libs/react-bootstrap',
     ],
     'react-dom': [
-      // 'https://unpkg.com/react-dom@17.0.2/umd/react-dom.production.min',
+      'https://cdn.jsdelivr.net/npm/react-dom@17.0.2/umd/react-dom.production.min',
+      'https://unpkg.com/react-dom@17.0.2/umd/react-dom.production.min',
       'libs/react-dom',
     ],
     'prop-types': [
-      // 'https://unpkg.com/prop-types@15.6/prop-types.min',
+      'https://cdn.jsdelivr.net/npm/prop-types@15.6/prop-types.min',
+      'https://unpkg.com/prop-types@15.6/prop-types.min',
       'libs/prop-types',
     ],
     'react-redux': [
-      // 'https://unpkg.com/react-redux@7.2.4/dist/react-redux.min',
+      'https://cdn.jsdelivr.net/npm/react-redux@7.2.4/dist/react-redux.min',
+      'https://unpkg.com/react-redux@7.2.4/dist/react-redux.min',
       'libs/react-redux',
     ],
     'react-transition-group': [
-      // 'https://unpkg.com/react-transition-group@2.4.0/dist/react-transition-group.min',
+      'https://cdn.jsdelivr.net/npm/react-transition-group@2.4.0/dist/react-transition-group.min',
+      'https://unpkg.com/react-transition-group@2.4.0/dist/react-transition-group.min',
       'libs/react-transition-group',
     ],
     redux: [
-      // 'https://unpkg.com/redux@4.0.5/dist/redux.min',
+      'https://cdn.jsdelivr.net/npm/redux@4.0.5/dist/redux.min',
+      'https://unpkg.com/redux@4.0.5/dist/redux.min',
       'libs/redux',
     ],
     'redux-thunk': [
-      // 'https://unpkg.com/redux-thunk@2.3.0/dist/redux-thunk.min',
+      'https://cdn.jsdelivr.net/npm/redux-thunk@2.3.0/dist/redux-thunk.min',
+      'https://unpkg.com/redux-thunk@2.3.0/dist/redux-thunk.min',
       'libs/redux-thunk',
     ],
     select2: [
-      // 'https://unpkg.com/select2@4.0.3/dist/js/select2.min',
+      'https://cdn.jsdelivr.net/npm/select2@4.0.3/dist/js/select2.min',
+      'https://unpkg.com/select2@4.0.3/dist/js/select2.min',
       'libs/select2/select2',
     ],
     'react-aria-menubutton': [
-      // 'https://unpkg.com/react-aria-menubutton@7.0.3/umd/ReactAriaMenuButton',
+      'https://cdn.jsdelivr.net/npm/react-aria-menubutton@7.0.3/umd/ReactAriaMenuButton',
+      'https://unpkg.com/react-aria-menubutton@7.0.3/umd/ReactAriaMenuButton',
       'libs/react-aria-menubutton',
     ],
     'react-hook-form': [
-      // 'https://unpkg.com/react-hook-form@6.11.0/dist/index.umd.production.min',
+      'https://cdn.jsdelivr.net/npm/react-hook-form@6.11.0/dist/index.umd.production.min',
+      'https://unpkg.com/react-hook-form@6.11.0/dist/index.umd.production.min',
       'libs/react-hook-form',
     ],
     'react-is': [
-      // 'https://unpkg.com/react-is@17.0.2/umd/react-is.production.min',
+      'https://cdn.jsdelivr.net/npm/react-is@17.0.2/umd/react-is.production.min',
+      'https://unpkg.com/react-is@17.0.2/umd/react-is.production.min',
       'libs/react-is',
     ],
     'react-data-table-component': [
-      // 'https://unpkg.com/react-data-table-component@6.11.7/dist/react-data-table-component.umd',
+      'https://cdn.jsdelivr.net/npm/react-data-table-component@6.11.7/dist/react-data-table-component.umd',
+      'https://unpkg.com/react-data-table-component@6.11.7/dist/react-data-table-component.umd',
       'libs/react-data-table-component',
     ],
     'react-window': [
-      // 'https://unpkg.com/react-window@1.8.6/dist/index-prod.umd',
+      'https://cdn.jsdelivr.net/npm/react-window@1.8.6/dist/index-prod.umd',
+      'https://unpkg.com/react-window@1.8.6/dist/index-prod.umd',
       'libs/react-window',
     ],
     'react-async': [
-      // 'https://unpkg.com/react-async@10.0.1/dist-umd/index',
+      'https://cdn.jsdelivr.net/npm/react-async@10.0.1/dist-umd/index',
+      'https://unpkg.com/react-async@10.0.1/dist-umd/index',
       'libs/react-async',
     ],
     'regenerator-runtime': [
-      // 'https://unpkg.com/regenerator-runtime@0.13.9/runtime',
+      'https://cdn.jsdelivr.net/npm/regenerator-runtime@0.13.9/runtime',
+      'https://unpkg.com/regenerator-runtime@0.13.9/runtime',
       'libs/regenerator-runtime',
     ],
     diff: [
-      // 'https://unpkg.com/diff@4.0.2/dist/diff.min',
+      'https://cdn.jsdelivr.net/npm/diff@4.0.2/dist/diff.min',
+      'https://unpkg.com/diff@4.0.2/dist/diff.min',
       'libs/diff',
     ],
     'styled-components': [
-      // 'https://unpkg.com/styled-components@5.1.0/dist/styled-components.min',
+      'https://cdn.jsdelivr.net/npm/styled-components@5.1.0/dist/styled-components.min',
+      'https://unpkg.com/styled-components@5.1.0/dist/styled-components.min',
       'libs/styled-components',
     ],
     '@hookform/resolvers': [
-      // 'https://unpkg.com/@hookform/resolvers@0.1.0/dist/index.umd.production.min',
+      'https://cdn.jsdelivr.net/npm/@hookform/resolvers@0.1.0/dist/index.umd.production.min',
+      'https://unpkg.com/@hookform/resolvers@0.1.0/dist/index.umd.production.min',
       'libs/hookform',
     ],
+
+    // Google analytics loaded locally only
     'google-analytics': [
       // to activate local tunnel (for us to collect all analytics data)
       // uncomment this; k12 should have ingress-nginx-proxy image deployed
@@ -446,88 +486,4 @@ require.config({
       exports: 'Persist',
     },
   },
-  onNodeCreated: function(node, config, module, path) {
-    // SRIs for the CDNs used in the paths above
-    const sri = {
-      underscore:
-        'sha384-qDQQphxk4GGOzXrYWcGvL65XEe3wWt0lpN1IWIttQvQvewLpET6XzmQiKr3kew5R',
-      backbone: 'sha256-ddKDRLG4O1+xU/xZOb3BC0BKdU2T9498HIqLgd43aCU=',
-      'backbone-validation':
-        'sha384-fpdyr8ISauDi3YRemFSS/fadDnGzGiz2QdiRavwVGgPr2dd8f9VEaubnO5XhWZGr',
-      'backbone.stickit':
-        'sha384-LnepiBNV2LUVxUIF/sLNzcLmusDbfFnOVijtZFrhooeopW0037kRRfZD/xIZWXoC',
-      'backbone.wreqr':
-        'sha384-IzfqdomcRie+VgR5xKLxPJABpi9TADoX+rb7/w2Ao1up49TbjdBZXaIpoagGW20t',
-      bootstrap:
-        'sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa',
-      bowser:
-        'sha384-Z0KxlcdLj4l74yAkZm1zrXtmCVWpuBPQ2MbDARb3dgtIwzTfG95hDk53DYVunmKL',
-      clipboard:
-        'sha384-cV+rhyOuRHc9Ub/91rihWcGmMmCXDeksTtCihMupQHSsi8GIIRDG0ThDc3HGQFJ3',
-      d3:
-        'sha384-N8EP0Yml0jN7e0DcXlZ6rt+iqKU9Ck6f1ZQ+j2puxatnBq4k9E8Q6vqBcY34LNbn',
-      'd3-cloud':
-        'sha384-6RmikqUV3J90YjNQ6j3aGUYxrYRgPnpfL+iGR7riVJSMgSaUxq12B9bYc7xgk29E',
-      filesaver:
-        'sha384-VgWGwiEJnh9P379lbU8DxPcfRuFkfLl0uPuL9tolOHtm2tx8Qy8d/KtvovfM0Udh',
-      hotkeys:
-        'sha384-a9EmIZ/DK+uZtwt6PYXWQnJ5HVwJ9a8klNTM9UizXmEdYbVAfuhoERwcC9MDTrLU',
-      jquery:
-        'sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB',
-      jsonpath:
-        'sha384-87Cywb3gQWq5tkmzcpOPCT5fkfEMexH1yQUBGx0xrr/BvXqwulIHsB8JSg06h6mV',
-      marionette:
-        'sha384-Vhqh90N6FKyphb9enak5e49Ty9xD2dHphudmx93Y1ZgxShTXxiNsUliAbMsyOsQ0',
-      moment:
-        'sha384-sIzeKWIAHvT0Vm8QbfLCqZwBG0WMCkWVAOYd/330YSNeeQ1Y57N3T9lQz5Ry/EHH',
-      'persist-js':
-        'sha384-IQ8LQBnxRLItFm2zBR7ehQAjX2c5kAvrnmQUDQCDhl5whNOy/Qrt4OkNPBPZqrgE',
-      react:
-        'sha384-ZHBAhj6mPF2wke1Ie6UN+ozxCHBXIuRrcszqkblgAqCrZtYGI3zZYn4SsU+ozss4',
-      'react-bootstrap':
-        'sha384-9Cmt0BSVYuRFR8JkyWNFQ7b58m8/zLVP3u9etA7xRzOTmv9v6dk0exj5ZVr/US/7',
-      'react-dom':
-        'sha384-vj2XpC1SOa8PHrb0YlBqKN7CQzJYO72jz4CkDQ+ePL1pwOV4+dn05rPrbLGUuvCv',
-      'prop-types':
-        'sha384-9Fq52URRAaPlKGhu0AzshypUBBQa7Q8Rz1ze2svcZNUHGb/PlxTygZmtyYeqEHOK',
-      'react-redux':
-        'sha384-ZcmZKz11wjrgTJINgsPUjE81MDefPp3T3yXjqwmOfWs3mOrXiNJp8tuDDGIL4SBh',
-      'react-transition-group':
-        'sha384-WabrKyNVsCPcBkbcgLk2GI5B9r3bcu7AS+xIjuNWXpiEG2YFbGYKxIMH30PZ8ppV',
-      redux:
-        'sha384-9HbrkMEA4yvYaxArVwUh+buL6aVxBnmvot0vCxX8eUFaa1U/iT5eb51kaT7X4q+j',
-      'redux-thunk':
-        'sha384-clksQEsrkq4U3jNhSd+pCTsDFvPnSxN2xr0WUy2LOXFxC8KvqinvNJJ3656K5Tkf',
-      select2:
-        'sha384-222hzbb8Z8ZKe6pzP18nTSltQM3PdcAwxWKzGOKOIF+Y3bROr5n9zdQ8yTRHgQkQ',
-      'react-aria-menubutton':
-        'sha384-sAiCfhNvllSt31QXulF/DbYmp8k6C5WIdSygBF7QC7wK5h8mnwxrN1fsEV0K8H+Z',
-      'react-hook-form':
-        'sha384-o00KobsI/OBvRsqSR+XM/cniIcEZDOEDS+fEtCVrU4fdh90ysgmIQZZ3TXBGEw/H',
-      'react-is':
-        'sha384-SrjF4gb2WbeLH6ACmw6dLWBMHqfhwqgZe9F/N1TPzAyFjFESpC/3OGcG6fGVFmk7',
-      'react-data-table-component':
-        'sha384-VyrMwF3/DjWtRddANOUdwGMV7031w/5cVZqzVwvGUbbulGSJsybNgmS2D8QBUOK5',
-      'react-window':
-        'sha384-Z5ne52XzIcFV98V/UeunHiOluolr3PBTKThF1pmLrbAMod3centtxqggBRdbxyyE',
-      'react-async':
-        'sha384-pe0YbZ0dk7ipNViDks2le1j8l9T6jhcuzbc9MLfv8TwNe8BwdwE0/h0BcKL07khI',
-      'regenerator-runtime':
-        'sha384-jMSVkO5iDhd7A6dfEXFuT++7Gvv/f6T8bq3ZRHA9KE/kpyE/GL8B7NLfGSONzAym',
-      mathjax:
-        'sha512-xAWI9i8WMRLdgksuhaMCYMTw9D+MEc2cYVBApWwGRJ0cdcywTjMovOfJnlGt9LlEQj6QzyMzpIZLMYujetPcQg==',
-      'jquery-ui': 'sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU=',
-      'styled-components':
-        'sha384-BJn7wepCcL8YGN8QnwJVmNKvnmPJD2zhlTLhZu5bNAJPs8OcbR38EctHcBG9KkF5',
-      '@hookform/resolvers':
-        'sha384-S8X/bKV7Zk250Ypfl+DfV8dUbSy1ZxD1pumo0pibFWGpFmGyAZ8+Zj3cz2EGup6g',
-      diff:
-        'sha384-dt7nA4/ksfhWiEl0OCs7aTXG5NkDyqzERlkfaGZ2kwmEn58sz6Yo9d+mF8XgA+H/',
-    };
-
-    if (sri[module] && /^https?/.exec(path)) {
-      node.setAttribute('integrity', sri[module]);
-      node.setAttribute('crossorigin', 'anonymous');
-    }
-  },
 });
diff --git a/src/config/shim.js b/src/config/shim.js
index 06e09b86b..640698785 100644
--- a/src/config/shim.js
+++ b/src/config/shim.js
@@ -62,7 +62,7 @@
       // sometimes requirejs isn't ready yet, this will wait for it
       if (window.requirejs) {
         window.requirejs.config({
-          waitSeconds: 7,
+          waitSeconds: 0,
           urlArgs: version,
         });
 
@@ -80,6 +80,11 @@
 (function checkIfProxied() {
   const canonicalUrlPattern = /^(ui|qa|dev|devui|demo)\.adsabs\.harvard\.edu$/;
 
+  // ignore for localhost (development)
+  if (/^localhost$/.exec(window.location.hostname)) {
+    return;
+  }
+
   // if test fails, it is proxied url, set a class on body element
   if (!canonicalUrlPattern.test(window.location.hostname)) {
     const [bodyEl] = document.getElementsByTagName('body');
diff --git a/src/index.html b/src/index.html
index b1df0ae5c..b08c6b02d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -140,7 +140,17 @@ <h3 id="basic-html-message">
           loadingContainer.setAttribute('style', '');
         }, 3000);
 
+        /**
+         *
+         */
         window.__setAppLoadingProgress = function(val, msg) {
+          if (typeof val === 'function') {
+            const newVal = val(progressValue);
+            if (typeof newVal === 'number') {
+              return window.__setAppLoadingProgress(newVal, msg);
+            }
+          }
+
           if (val < progressValue) return;
           try {
             progressBar.setAttribute('aria-valuenow', val);
diff --git a/src/js/apps/discovery/main.js b/src/js/apps/discovery/main.js
index 77b6ab553..5e01f3d3a 100644
--- a/src/js/apps/discovery/main.js
+++ b/src/js/apps/discovery/main.js
@@ -31,13 +31,11 @@ define(['config/discovery.config', 'module'], function(config, module) {
     ApiFeedback,
     analytics
   ) {
-    var updateProgress =
+    const updateProgress =
       typeof window.__setAppLoadingProgress === 'function'
         ? window.__setAppLoadingProgress
         : function() {};
 
-    var timeStart = Date.now();
-
     Application.prototype.shim();
 
     // at the beginning, we don't know anything about ourselves...
@@ -46,17 +44,18 @@ define(['config/discovery.config', 'module'], function(config, module) {
     // app object will load everything
     var app = new (Application.extend(DiscoveryBootstrap))({
       debug: debug,
-      timeout: 300000, // 5 minutes
+
+      // This is a general timeout which is only used per-module (plugins, controllers, etc.)
+      timeout: 60 * 1000, // 60 * 1000, // 60 seconds
     });
 
     // load the objects/widgets/modules (using discovery.config.js)
     var appPromise = app.loadModules(module.config());
 
-    updateProgress(20, 'Starting Application');
+    updateProgress(30, 'Loading Modules');
 
     var startApp = function() {
-      updateProgress(50, 'Modules Loaded');
-      var timeLoaded = Date.now();
+      updateProgress(80, 'App Loaded');
 
       // this will activate all loaded modules
       app.activate();
diff --git a/src/js/components/application.js b/src/js/components/application.js
index 4d14af933..981380048 100644
--- a/src/js/components/application.js
+++ b/src/js/components/application.js
@@ -48,6 +48,13 @@ define([
   'js/components/beehive',
   'js/mixins/api_access',
 ], function(_, $, Backbone, module, BeeHive, ApiAccess) {
+  const DEFAULT_MODULE_TIMEOUT = 60 * 1000; // 60 seconds
+
+  const updateProgress =
+    typeof window.__setAppLoadingProgress === 'function'
+      ? window.__setAppLoadingProgress
+      : function() {};
+
   var Application = function(options) {
     options || (options = {});
     this.aid = _.uniqueId('application');
@@ -132,7 +139,9 @@ define([
         ) {
           if (core[name]) {
             promise = self._loadModules(name, core[name]);
-            if (promise) promises.push(promise);
+            if (promise) {
+              promises.push(promise);
+            }
           }
         });
       }
@@ -178,6 +187,14 @@ define([
       // hack, so that $.when() always returns []
       promises.length === 1 && promises.push(promise);
 
+      // add a handler for updating the app loading bar
+      let count = 0;
+      promises.map((p) =>
+        p.then(() => {
+          self.logModuleLoaded((count += 1), promises.length);
+        })
+      );
+
       var bigPromise = $.Deferred();
       $.when
         .apply($, promises)
@@ -187,6 +204,7 @@ define([
               if (self.debug) {
                 console.log('application: registering ' + promisedValues[0]);
               }
+
               self._registerLoadedModules.apply(self, promisedValues);
             }
           });
@@ -239,7 +257,7 @@ define([
 
       // console.log('registering', section, modules);
 
-      if (section == 'controllers') {
+      if (section === 'controllers') {
         hasKey = _.bind(this.hasController, this);
         removeKey = _.bind(function(key) {
           this.__controllers.remove(key);
@@ -247,15 +265,15 @@ define([
         addKey = _.bind(function(key, module) {
           this.__controllers.add(key, module);
         }, this);
-      } else if (section == 'services') {
+      } else if (section === 'services') {
         hasKey = _.bind(beehive.hasService, beehive);
         removeKey = _.bind(beehive.removeService, beehive);
         addKey = _.bind(beehive.addService, beehive);
-      } else if (section == 'objects') {
+      } else if (section === 'objects') {
         hasKey = _.bind(beehive.hasObject, beehive);
         removeKey = _.bind(beehive.removeObject, beehive);
         addKey = _.bind(beehive.addObject, beehive);
-      } else if (section == 'modules') {
+      } else if (section === 'modules') {
         createInstance = function(key, module) {
           return module;
         };
@@ -266,7 +284,7 @@ define([
         addKey = _.bind(function(key, module) {
           this.__modules.add(key, module);
         }, this);
-      } else if (section == 'widgets') {
+      } else if (section === 'widgets') {
         hasKey = _.bind(this.hasWidget, this);
         removeKey = _.bind(function(key) {
           this.__widgets.remove(key);
@@ -277,7 +295,7 @@ define([
         createInstance = function(key, module) {
           return module;
         };
-      } else if (section == 'plugins') {
+      } else if (section === 'plugins') {
         hasKey = _.bind(this.hasPlugin, this);
         removeKey = _.bind(function(key) {
           this.__plugins.remove(key);
@@ -408,13 +426,20 @@ define([
 
     _setTimeout: function(deferred) {
       setTimeout(function() {
-        if (deferred.state() != 'resolved') {
+        if (deferred.state() !== 'resolved') {
           deferred.reject('Timeout, application is loading too long');
         }
-      }, this.timeout || 30000);
+      }, this.timeout || DEFAULT_MODULE_TIMEOUT);
       return deferred;
     },
 
+    logModuleLoaded: function(idx, total) {
+      updateProgress(
+        (val) => val + 50 / total,
+        `Loading Modules ${idx} of ${total}`
+      );
+    },
+
     destroy: function() {
       this.getBeeHive().destroy();
     },
@@ -731,8 +756,8 @@ define([
       var symbolicName = cat + ':' + name;
 
       if (
-        (cat == 'plugin' && !this.hasPlugin(name)) ||
-        (cat == 'widget' && !this.hasWidget(name))
+        (cat === 'plugin' && !this.hasPlugin(name)) ||
+        (cat === 'widget' && !this.hasWidget(name))
       ) {
         throw new Error(
           'We cannot give you ' +
@@ -745,7 +770,7 @@ define([
         return this._getBarbarian(symbolicName);
 
       var constructor =
-        cat == 'plugin' ? this.__plugins.get(name) : this.__widgets.get(name);
+        cat === 'plugin' ? this.__plugins.get(name) : this.__widgets.get(name);
       var instance = new constructor();
       var hardenedBee = this.getBeeHive().getHardenedInstance();
       var children;
@@ -782,16 +807,16 @@ define([
       var self = this;
       var loader;
       var placeholder;
-      if (cat == 'plugin') {
+      if (cat === 'plugin') {
         placeholder = self.__plugins;
-      } else if (cat == 'widget') {
+      } else if (cat === 'widget') {
         placeholder = self.__widgets;
       } else {
         throw new Error(cat + ' cannot be lazy loaded, sorry');
       }
       var thing = placeholder.get(name);
 
-      if (thing == null) {
+      if (thing === null) {
         defer.reject(name + ' does not exist');
       } else if (thing && thing.lazyLoad) {
         // load it
@@ -952,7 +977,7 @@ define([
       _.each(
         this.__barbarianRegistry,
         function(value, key) {
-          if (value == symbolicName) delete this.__barbarianRegistry[key];
+          if (value === symbolicName) delete this.__barbarianRegistry[key];
         },
         this
       );
@@ -1025,7 +1050,7 @@ define([
         var out = [];
         if (w.length > 1) {
           out = _.pairs(widget);
-        } else if (w.length == 1) {
+        } else if (w.length === 1) {
           out = [[w[0], widget]];
         }
         defer.resolve(out);