Also declare the template paths in main.js

main.js

@@ -1,62 +1,105 @@
 config = {
     baseUrl: '.',
     paths: {
-        "backbone": "components/backbone/backbone",
-        "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
-        "backbone.overview": "components/backbone.overview/backbone.overview",
-        "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",
+        "backbone":                 "components/backbone/backbone",
+        "backbone.browserStorage":  "components/backbone.browserStorage/backbone.browserStorage",
+        "backbone.overview":        "components/backbone.overview/backbone.overview",
+        "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",
-        "crypto.core": "components/otr/vendor/cryptojs/core",
-        "crypto.enc-base64": "components/otr/vendor/cryptojs/enc-base64",
-        "crypto.evpkdf": "components/crypto-js-evanvosberg/src/evpkdf",
-        "crypto.hmac": "components/otr/vendor/cryptojs/hmac",
-        "crypto.md5": "components/crypto-js-evanvosberg/src/md5",
-        "crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
+        "bigint":               "src/bigint",
+        "crypto":               "src/crypto",
+        "crypto.aes":           "components/otr/vendor/cryptojs/aes",
+        "crypto.cipher-core":   "components/otr/vendor/cryptojs/cipher-core",
+        "crypto.core":          "components/otr/vendor/cryptojs/core",
+        "crypto.enc-base64":    "components/otr/vendor/cryptojs/enc-base64",
+        "crypto.evpkdf":        "components/crypto-js-evanvosberg/src/evpkdf",
+        "crypto.hmac":          "components/otr/vendor/cryptojs/hmac",
+        "crypto.md5":           "components/crypto-js-evanvosberg/src/md5",
+        "crypto.mode-ctr":      "components/otr/vendor/cryptojs/mode-ctr",
         "crypto.pad-nopadding": "components/otr/vendor/cryptojs/pad-nopadding",
-        "crypto.sha1": "components/otr/vendor/cryptojs/sha1",
-        "crypto.sha256": "components/otr/vendor/cryptojs/sha256",
-        "salsa20": "components/otr/build/dep/salsa20",
-        "otr": "src/otr",
+        "crypto.sha1":         "components/otr/vendor/cryptojs/sha1",
+        "crypto.sha256":        "components/otr/vendor/cryptojs/sha256",
+        "salsa20":              "components/otr/build/dep/salsa20",
+        "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"
+        "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",
+
+        // Templates
+        "action":                   "src/templates/action",
+        "add_contact_dropdown":     "src/templates/add_contact_dropdown",
+        "add_contact_form":         "src/templates/add_contact_form",
+        "change_status_message":    "src/templates/change_status_message",
+        "chat_status":              "src/templates/chat_status",
+        "chatarea":                 "src/templates/chatarea",
+        "chatbox":                  "src/templates/chatbox",
+        "chatroom":                 "src/templates/chatroom",
+        "chatrooms_tab":            "src/templates/chatrooms_tab",
+        "chats_panel":              "src/templates/chats_panel",
+        "choose_status":            "src/templates/choose_status",
+        "contacts_panel":           "src/templates/contacts_panel",
+        "contacts_tab":             "src/templates/contacts_tab",
+        "controlbox":               "src/templates/controlbox",
+        "controlbox_toggle":        "src/templates/controlbox_toggle",
+        "field":                    "src/templates/field",
+        "form_checkbox":            "src/templates/form_checkbox",
+        "form_input":               "src/templates/form_input",
+        "form_select":              "src/templates/form_select",
+        "group_header":             "src/templates/group_header",
+        "info":                     "src/templates/info",
+        "login_panel":              "src/templates/login_panel",
+        "login_tab":                "src/templates/login_tab",
+        "message":                  "src/templates/message",
+        "new_day":                  "src/templates/new_day",
+        "occupant":                 "src/templates/occupant",
+        "pending_contact":          "src/templates/pending_contact",
+        "pending_contacts":         "src/templates/pending_contacts",
+        "requesting_contact":       "src/templates/requesting_contact",
+        "requesting_contacts":      "src/templates/requesting_contacts",
+        "room_description":         "src/templates/room_description",
+        "room_item":                "src/templates/room_item",
+        "room_panel":               "src/templates/room_panel",
+        "roster":                   "src/templates/roster",
+        "roster_item":              "src/templates/roster_item",
+        "search_contact":           "src/templates/search_contact",
+        "select_option":            "src/templates/select_option",
+        "status_option":            "src/templates/status_option",
+        "toggle_chats":             "src/templates/toggle_chats",
+        "toolbar":                  "src/templates/toolbar",
+        "trimmed_chat":             "src/templates/trimmed_chat"
     },
 
     tpl: {

src/templates.js

@@ -1,45 +1,45 @@
 define("converse-templates", [
-    "tpl!src/templates/action",
-    "tpl!src/templates/add_contact_dropdown",
-    "tpl!src/templates/add_contact_form",
-    "tpl!src/templates/change_status_message",
-    "tpl!src/templates/chat_status",
-    "tpl!src/templates/chatarea",
-    "tpl!src/templates/chatbox",
-    "tpl!src/templates/chatroom",
-    "tpl!src/templates/chatrooms_tab",
-    "tpl!src/templates/chats_panel",
-    "tpl!src/templates/choose_status",
-    "tpl!src/templates/contacts_panel",
-    "tpl!src/templates/contacts_tab",
-    "tpl!src/templates/controlbox",
-    "tpl!src/templates/controlbox_toggle",
-    "tpl!src/templates/field",
-    "tpl!src/templates/form_checkbox",
-    "tpl!src/templates/form_input",
-    "tpl!src/templates/form_select",
-    "tpl!src/templates/group_header",
-    "tpl!src/templates/info",
-    "tpl!src/templates/login_panel",
-    "tpl!src/templates/login_tab",
-    "tpl!src/templates/message",
-    "tpl!src/templates/new_day",
-    "tpl!src/templates/occupant",
-    "tpl!src/templates/pending_contact",
-    "tpl!src/templates/pending_contacts",
-    "tpl!src/templates/requesting_contact",
-    "tpl!src/templates/requesting_contacts",
-    "tpl!src/templates/room_description",
-    "tpl!src/templates/room_item",
-    "tpl!src/templates/room_panel",
-    "tpl!src/templates/roster",
-    "tpl!src/templates/roster_item",
-    "tpl!src/templates/select_option",
-    "tpl!src/templates/search_contact",
-    "tpl!src/templates/status_option",
-    "tpl!src/templates/toggle_chats",
-    "tpl!src/templates/toolbar",
-    "tpl!src/templates/trimmed_chat"
+    "tpl!action",
+    "tpl!add_contact_dropdown",
+    "tpl!add_contact_form",
+    "tpl!change_status_message",
+    "tpl!chat_status",
+    "tpl!chatarea",
+    "tpl!chatbox",
+    "tpl!chatroom",
+    "tpl!chatrooms_tab",
+    "tpl!chats_panel",
+    "tpl!choose_status",
+    "tpl!contacts_panel",
+    "tpl!contacts_tab",
+    "tpl!controlbox",
+    "tpl!controlbox_toggle",
+    "tpl!field",
+    "tpl!form_checkbox",
+    "tpl!form_input",
+    "tpl!form_select",
+    "tpl!group_header",
+    "tpl!info",
+    "tpl!login_panel",
+    "tpl!login_tab",
+    "tpl!message",
+    "tpl!new_day",
+    "tpl!occupant",
+    "tpl!pending_contact",
+    "tpl!pending_contacts",
+    "tpl!requesting_contact",
+    "tpl!requesting_contacts",
+    "tpl!room_description",
+    "tpl!room_item",
+    "tpl!room_panel",
+    "tpl!roster",
+    "tpl!roster_item",
+    "tpl!select_option",
+    "tpl!search_contact",
+    "tpl!status_option",
+    "tpl!toggle_chats",
+    "tpl!toolbar",
+    "tpl!trimmed_chat"
 ], function () {
     return {
         action:                 arguments[0],