diff --git a/locale/locales.js b/locale/locales.js
index f1b2c32be..8a0f913cb 100644
--- a/locale/locales.js
+++ b/locale/locales.js
@@ -6,25 +6,6 @@
  */
 
 (function (root, factory) {
-    require.config({
-        paths: {
-            "af": "locale/af/LC_MESSAGES/af",
-            "de": "locale/de/LC_MESSAGES/de",
-            "en": "locale/en/LC_MESSAGES/en",
-            "es": "locale/es/LC_MESSAGES/es",
-            "fr": "locale/fr/LC_MESSAGES/fr",
-            "he": "locale/he/LC_MESSAGES/he",
-            "hu": "locale/hu/LC_MESSAGES/hu",
-            "id": "locale/id/LC_MESSAGES/id",
-            "it": "locale/it/LC_MESSAGES/it",
-            "ja": "locale/ja/LC_MESSAGES/ja",
-            "nl": "locale/nl/LC_MESSAGES/nl",
-            "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
-            "ru": "locale/ru/LC_MESSAGES/ru",
-            "zh": "locale/zh/LC_MESSAGES/zh"
-        }
-    });
-
     define("locales", [
         'jed',
         'af',
diff --git a/main.js b/main.js
index dc2dac313..750670b79 100644
--- a/main.js
+++ b/main.js
@@ -4,10 +4,27 @@ config = {
         "backbone": "components/backbone/backbone",
         "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
         "backbone.overview": "components/backbone.overview/backbone.overview",
-        "bigint": "src/bigint",
         "bootstrap": "components/bootstrap/dist/js/bootstrap",                  // XXX: Only required for https://conversejs.org website
         "converse-dependencies": "src/deps-website",
         "converse-templates": "src/templates",
+        "eventemitter": "components/otr/build/dep/eventemitter",
+        "jquery": "components/jquery/dist/jquery",
+        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
+        "jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
+        "moment": "components/momentjs/moment",
+        "strophe": "components/strophe/strophe",
+        "strophe.disco": "components/strophe.disco/index",
+        "strophe.muc": "components/strophe.muc/index",
+        "strophe.roster": "components/strophe.roster/index",
+        "strophe.vcard": "components/strophe.vcard/index",
+        "text": 'components/requirejs-text/text',
+        "tpl": 'components/requirejs-tpl-jcbrand/tpl',
+        "typeahead": 'components/typeahead.js/dist/typeahead.jquery',
+        "underscore": "components/underscore/underscore",
+        "utils": "src/utils",
+
+        // Off-the-record-encryption
+        "bigint": "src/bigint",
         "crypto": "src/crypto",
         "crypto.aes": "components/otr/vendor/cryptojs/aes",
         "crypto.cipher-core": "components/otr/vendor/cryptojs/cipher-core",
@@ -20,25 +37,26 @@ config = {
         "crypto.pad-nopadding": "components/otr/vendor/cryptojs/pad-nopadding",
         "crypto.sha1": "components/otr/vendor/cryptojs/sha1",
         "crypto.sha256": "components/otr/vendor/cryptojs/sha256",
-        "eventemitter": "components/otr/build/dep/eventemitter",
-        "jed": "components/jed/jed",
-        "jquery": "components/jquery/dist/jquery",
-        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
-        "jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
-        "locales": "locale/locales",
-        "moment": "components/momentjs/moment",
-        "otr": "src/otr",
         "salsa20": "components/otr/build/dep/salsa20",
-        "strophe": "components/strophe/strophe",
-        "strophe.disco": "components/strophe.disco/index",
-        "strophe.muc": "components/strophe.muc/index",
-        "strophe.roster": "components/strophe.roster/index",
-        "strophe.vcard": "components/strophe.vcard/index",
-        "text": 'components/requirejs-text/text',
-        "tpl": 'components/requirejs-tpl-jcbrand/tpl',
-        "typeahead": 'components/typeahead.js/dist/typeahead.jquery',
-        "underscore": "components/underscore/underscore",
-        "utils": "src/utils"
+        "otr": "src/otr",
+
+        // Locales paths
+        "locales": "locale/locales",
+        "jed": "components/jed/jed",
+        "af": "locale/af/LC_MESSAGES/af",
+        "de": "locale/de/LC_MESSAGES/de",
+        "en": "locale/en/LC_MESSAGES/en",
+        "es": "locale/es/LC_MESSAGES/es",
+        "fr": "locale/fr/LC_MESSAGES/fr",
+        "he": "locale/he/LC_MESSAGES/he",
+        "hu": "locale/hu/LC_MESSAGES/hu",
+        "id": "locale/id/LC_MESSAGES/id",
+        "it": "locale/it/LC_MESSAGES/it",
+        "ja": "locale/ja/LC_MESSAGES/ja",
+        "nl": "locale/nl/LC_MESSAGES/nl",
+        "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
+        "ru": "locale/ru/LC_MESSAGES/ru",
+        "zh": "locale/zh/LC_MESSAGES/zh"
     },
 
     tpl: {