diff --git a/app.js b/app.js
index 65238fcfd9..0e3f8d2556 100644
--- a/app.js
+++ b/app.js
@@ -33,6 +33,7 @@ var fs = require('fs'),
 
 
 global.env = process.env.NODE_ENV || 'production';
+global.env = process.env.NODE_ENV = 'production';
 
 winston.remove(winston.transports.Console);
 winston.add(winston.transports.Console, {
diff --git a/public/src/forum/account/edit.js b/public/src/forum/account/edit.js
index acbe3275a6..c8e1fe18c0 100644
--- a/public/src/forum/account/edit.js
+++ b/public/src/forum/account/edit.js
@@ -2,7 +2,7 @@
 
 /* globals define, ajaxify, socket, app, config, utils, translator */
 
-define(['forum/account/header', 'uploader'], function(header, uploader) {
+define('forum/account/edit', ['forum/account/header', 'uploader'], function(header, uploader) {
 	var AccountEdit = {},
 		gravatarPicture = '',
 		uploadedPicture = '',
diff --git a/public/src/forum/account/favourites.js b/public/src/forum/account/favourites.js
index 5b36c58831..67f12816a2 100644
--- a/public/src/forum/account/favourites.js
+++ b/public/src/forum/account/favourites.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, utils */
 
-define(['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) {
+define('forum/account/favourites', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) {
 	var Favourites = {};
 
 	Favourites.init = function() {
diff --git a/public/src/forum/account/followers.js b/public/src/forum/account/followers.js
index 57e39fe54f..6dfb3bf83c 100644
--- a/public/src/forum/account/followers.js
+++ b/public/src/forum/account/followers.js
@@ -1,4 +1,4 @@
-define(['forum/account/header'], function(header) {
+define('forum/account/followers', ['forum/account/header'], function(header) {
 	var	Followers = {};
 
 	Followers.init = function() {
diff --git a/public/src/forum/account/following.js b/public/src/forum/account/following.js
index 0da72b8ccf..0e27a235aa 100644
--- a/public/src/forum/account/following.js
+++ b/public/src/forum/account/following.js
@@ -1,4 +1,4 @@
-define(['forum/account/header'], function(header) {
+define('forum/account/following', ['forum/account/header'], function(header) {
 	var	Following = {};
 
 	Following.init = function() {
diff --git a/public/src/forum/account/header.js b/public/src/forum/account/header.js
index 687860554c..5198914bd2 100644
--- a/public/src/forum/account/header.js
+++ b/public/src/forum/account/header.js
@@ -1,4 +1,4 @@
-define(function() {
+define('forum/account/header', function() {
 	var	AccountHeader = {};
 
 	AccountHeader.init = function() {
diff --git a/public/src/forum/account/posts.js b/public/src/forum/account/posts.js
index 8a72f8b9cf..ffb5dc963b 100644
--- a/public/src/forum/account/posts.js
+++ b/public/src/forum/account/posts.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, socket, utils */
 
-define(['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) {
+define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) {
 	var AccountPosts = {};
 
 	AccountPosts.init = function() {
diff --git a/public/src/forum/account/profile.js b/public/src/forum/account/profile.js
index 3c89a5e272..9563fda6f1 100644
--- a/public/src/forum/account/profile.js
+++ b/public/src/forum/account/profile.js
@@ -2,7 +2,7 @@
 
 /* globals define, ajaxify, app, utils, socket, translator*/
 
-define(['forum/account/header'], function(header) {
+define('forum/account/profile', ['forum/account/header'], function(header) {
 	var Account = {},
 		yourid,
 		theirid,
diff --git a/public/src/forum/account/settings.js b/public/src/forum/account/settings.js
index 2c1f9508bf..3819f989c8 100644
--- a/public/src/forum/account/settings.js
+++ b/public/src/forum/account/settings.js
@@ -1,4 +1,4 @@
-define(['forum/account/header'], function(header) {
+define('forum/account/settings', ['forum/account/header'], function(header) {
 	var	AccountSettings = {};
 
 	AccountSettings.init = function() {
diff --git a/public/src/forum/account/topics.js b/public/src/forum/account/topics.js
index e9adcb3acc..1ba31eae3c 100644
--- a/public/src/forum/account/topics.js
+++ b/public/src/forum/account/topics.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, socket, utils */
 
-define(['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) {
+define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) {
 	var AccountTopics = {};
 
 	AccountTopics.init = function() {
diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js
index 6a6f2f9373..3c85a969d7 100644
--- a/public/src/forum/admin/categories.js
+++ b/public/src/forum/admin/categories.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define, socket, app, bootbox, templates, ajaxify, RELATIVE_PATH*/
 
-define(['uploader'], function(uploader) {
+define('forum/admin/categories', ['uploader'], function(uploader) {
 	var	Categories = {};
 
 	Categories.init = function() {
diff --git a/public/src/forum/admin/groups.js b/public/src/forum/admin/groups.js
index aa0c19950f..e1d945ac07 100644
--- a/public/src/forum/admin/groups.js
+++ b/public/src/forum/admin/groups.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define, templates, socket, ajaxify, app, bootbox*/
 
-define(function() {
+define('forum/admin/groups', function() {
 	var	Groups = {};
 
 	Groups.init = function() {
diff --git a/public/src/forum/admin/index.js b/public/src/forum/admin/index.js
index 4398dc3546..4126e99171 100644
--- a/public/src/forum/admin/index.js
+++ b/public/src/forum/admin/index.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define, ajaxify, app, socket, RELATIVE_PATH*/
 
-define(function() {
+define('forum/admin/index', function() {
 	var	Admin = {};
 
 	Admin.init = function() {
diff --git a/public/src/forum/admin/languages.js b/public/src/forum/admin/languages.js
index a01b0b90af..8c67f20de0 100644
--- a/public/src/forum/admin/languages.js
+++ b/public/src/forum/admin/languages.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define*/
 
-define(['forum/admin/settings'], function(Settings) {
+define('forum/admin/languages', ['forum/admin/settings'], function(Settings) {
 	$(function() {
 		Settings.prepare();
 	});
diff --git a/public/src/forum/admin/plugins.js b/public/src/forum/admin/plugins.js
index 1ae5aa6dd5..1985fa9c22 100644
--- a/public/src/forum/admin/plugins.js
+++ b/public/src/forum/admin/plugins.js
@@ -1,7 +1,7 @@
 "use strict";
 /* global define, app, socket */
 
-define(function() {
+define('forum/admin/plugins', function() {
 	var Plugins = {
 		init: function() {
 			var pluginsList = $('.plugins'),
diff --git a/public/src/forum/admin/settings.js b/public/src/forum/admin/settings.js
index b2315aa33e..c43ccc5c35 100644
--- a/public/src/forum/admin/settings.js
+++ b/public/src/forum/admin/settings.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define, app, socket, RELATIVE_PATH */
 
-define(['uploader', 'sounds'], function(uploader, sounds) {
+define('forum/admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
 	var Settings = {};
 
 	Settings.init = function() {
diff --git a/public/src/forum/admin/sounds.js b/public/src/forum/admin/sounds.js
index 5dc7047b54..66efaa550e 100644
--- a/public/src/forum/admin/sounds.js
+++ b/public/src/forum/admin/sounds.js
@@ -1,7 +1,7 @@
 "use strict";
 /* global define, socket */
 
-define(['sounds', 'settings'], function(Sounds, Settings) {
+define('forum/admin/sounds', ['sounds', 'settings'], function(Sounds, Settings) {
 	var	SoundsAdmin = {};
 
 	SoundsAdmin.init = function() {
diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js
index 7b832b9c0f..1addd44466 100644
--- a/public/src/forum/admin/themes.js
+++ b/public/src/forum/admin/themes.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define, socket, app, bootbox, tabIndent, config, RELATIVE_PATH*/
 
-define(['forum/admin/settings'], function(Settings) {
+define('forum/admin/themes', ['forum/admin/settings'], function(Settings) {
 	var Themes = {};
 
 	function highlightSelectedTheme(themeId) {
diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js
index 489e560fe2..ec6ecb5579 100644
--- a/public/src/forum/admin/users.js
+++ b/public/src/forum/admin/users.js
@@ -1,6 +1,6 @@
 "use strict";
 /* global socket, define, templates, bootbox, app, ajaxify,  */
-define(function() {
+define('forum/admin/users', function() {
 	var Users = {};
 
 	Users.init = function() {
diff --git a/public/src/forum/category.js b/public/src/forum/category.js
index 76ebaea7f5..a352221441 100644
--- a/public/src/forum/category.js
+++ b/public/src/forum/category.js
@@ -1,7 +1,7 @@
 "use strict";
 /* global define, config, templates, app, utils, ajaxify, socket, translator */
 
-define(['composer', 'forum/pagination', 'forum/infinitescroll', 'share', 'navigator', 'forum/categoryTools'], function(composer, pagination, infinitescroll, share, navigator, categoryTools) {
+define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll', 'share', 'navigator', 'forum/categoryTools'], function(composer, pagination, infinitescroll, share, navigator, categoryTools) {
 	var Category = {};
 
 	$(window).on('action:ajaxify.start', function(ev, data) {
diff --git a/public/src/forum/categoryTools.js b/public/src/forum/categoryTools.js
index 4af8056bec..13e6921ea8 100644
--- a/public/src/forum/categoryTools.js
+++ b/public/src/forum/categoryTools.js
@@ -4,7 +4,7 @@
 /* globals define, app, translator, socket, bootbox */
 
 
-define(['forum/topic/move', 'topicSelect'], function(move, topicSelect) {
+define('forum/categoryTools', ['forum/topic/move', 'topicSelect'], function(move, topicSelect) {
 
 	var CategoryTools = {};
 
diff --git a/public/src/forum/chats.js b/public/src/forum/chats.js
index 58a758d031..6d5587a11e 100644
--- a/public/src/forum/chats.js
+++ b/public/src/forum/chats.js
@@ -2,7 +2,7 @@
 
 /* globals define, app*/
 
-define(function() {
+define('forum/chats', function() {
 	var Chats = {};
 
 	Chats.init = function() {
diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index de0a25e81f..c8582a1b8c 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -1,4 +1,4 @@
-define(['notifications', 'chat'], function(Notifications, Chat) {
+define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) {
 
 	Notifications.prepareDOM();
 	Chat.prepareDOM();
diff --git a/public/src/forum/groups/details.js b/public/src/forum/groups/details.js
index a6fe290c0f..cbdc3cffa0 100644
--- a/public/src/forum/groups/details.js
+++ b/public/src/forum/groups/details.js
@@ -1,6 +1,6 @@
 "use strict";
 
-define(function() {
+define('forum/groups/details', function() {
 	var Details = {};
 
 	Details.init = function() {
diff --git a/public/src/forum/home.js b/public/src/forum/home.js
index 3796b2ca6f..b3a47db264 100644
--- a/public/src/forum/home.js
+++ b/public/src/forum/home.js
@@ -2,7 +2,7 @@
 
 /* globals define, socket, app, templates, translator, ajaxify*/
 
-define(function() {
+define('forum/home', function() {
 	var	home = {};
 
 	$(window).on('action:ajaxify.start', function(ev, data) {
diff --git a/public/src/forum/infinitescroll.js b/public/src/forum/infinitescroll.js
index 481b7c33c8..c942102dac 100644
--- a/public/src/forum/infinitescroll.js
+++ b/public/src/forum/infinitescroll.js
@@ -2,7 +2,7 @@
 
 /* globals define, socket, ajaxify, translator, templates, app */
 
-define(function() {
+define('forum/infinitescroll', function() {
 
 	var scroll = {};
 	var callback;
diff --git a/public/src/forum/login.js b/public/src/forum/login.js
index bc2362aa29..75754b04ca 100644
--- a/public/src/forum/login.js
+++ b/public/src/forum/login.js
@@ -1,7 +1,7 @@
 "use strict";
 /* global define, app, RELATIVE_PATH */
 
-define(function() {
+define('forum/login', function() {
 	var	Login = {};
 
 	Login.init = function() {
diff --git a/public/src/forum/notifications.js b/public/src/forum/notifications.js
index 55b7268a36..aed18cf315 100644
--- a/public/src/forum/notifications.js
+++ b/public/src/forum/notifications.js
@@ -1,4 +1,4 @@
-define(function() {
+define('forum/notifications', function() {
 	var Notifications = {};
 
 	Notifications.init = function() {
diff --git a/public/src/forum/pagination.js b/public/src/forum/pagination.js
index d34bf2cfd7..5aab6ada6b 100644
--- a/public/src/forum/pagination.js
+++ b/public/src/forum/pagination.js
@@ -1,7 +1,7 @@
 'use strict';
 /*global define, utils, ajaxify, bootbox*/
 
-define(function() {
+define('forum/pagination', function() {
 	var pagination = {};
 
 	pagination.currentPage = 0;
diff --git a/public/src/forum/popular.js b/public/src/forum/popular.js
index 87f12ddb8d..145f78f28c 100644
--- a/public/src/forum/popular.js
+++ b/public/src/forum/popular.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, socket*/
 
-define(['forum/recent', 'forum/infinitescroll'], function(recent, infinitescroll) {
+define('forum/popular', ['forum/recent', 'forum/infinitescroll'], function(recent, infinitescroll) {
 	var Popular = {},
 		active = '';
 
diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js
index 660d85777c..6b43d303ec 100644
--- a/public/src/forum/recent.js
+++ b/public/src/forum/recent.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, socket, utils */
 
-define(['forum/infinitescroll'], function(infinitescroll) {
+define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) {
 	var	Recent = {};
 
 	var newTopicCount = 0,
diff --git a/public/src/forum/register.js b/public/src/forum/register.js
index e669726a5a..8899fd161a 100644
--- a/public/src/forum/register.js
+++ b/public/src/forum/register.js
@@ -3,7 +3,7 @@
 /* globals define, app, utils, socket, config */
 
 
-define(function() {
+define('forum/register', function() {
 	var Register = {},
 		validationError = false,
 		successIcon = '<i class="fa fa-check"></i>';
diff --git a/public/src/forum/reset.js b/public/src/forum/reset.js
index a85c02cf46..3a0f4415ed 100644
--- a/public/src/forum/reset.js
+++ b/public/src/forum/reset.js
@@ -1,4 +1,4 @@
-define(function() {
+define('forum/reset', function() {
 	var	ResetPassword = {};
 
 	ResetPassword.init = function() {
diff --git a/public/src/forum/reset_code.js b/public/src/forum/reset_code.js
index b7a0d9caca..3a76c06c80 100644
--- a/public/src/forum/reset_code.js
+++ b/public/src/forum/reset_code.js
@@ -1,4 +1,4 @@
-define(function() {
+define('forum/reset_code', function() {
 	var	ResetCode = {};
 
 	ResetCode.init = function() {
diff --git a/public/src/forum/search.js b/public/src/forum/search.js
index 7543363e3b..39c47558d2 100644
--- a/public/src/forum/search.js
+++ b/public/src/forum/search.js
@@ -1,4 +1,4 @@
-define(function() {
+define('forum/search', function() {
 	var	Search = {};
 
 	Search.init = function() {
diff --git a/public/src/forum/tag.js b/public/src/forum/tag.js
index 84d922ecfc..ae8a45ac5a 100644
--- a/public/src/forum/tag.js
+++ b/public/src/forum/tag.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, socket */
 
-define(['forum/recent', 'forum/infinitescroll'], function(recent, infinitescroll) {
+define('forum/tag', ['forum/recent', 'forum/infinitescroll'], function(recent, infinitescroll) {
 	var Tag = {};
 
 	Tag.init = function() {
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 4337937a99..924ed68515 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -3,7 +3,7 @@
 
 /* globals define, app, templates, translator, socket, bootbox, config, ajaxify, RELATIVE_PATH, utils */
 
-define(['forum/pagination', 'forum/infinitescroll', 'forum/topic/threadTools', 'forum/topic/postTools', 'forum/topic/events', 'navigator'], function(pagination, infinitescroll, threadTools, postTools, events, navigator) {
+define('forum/topic', ['forum/pagination', 'forum/infinitescroll', 'forum/topic/threadTools', 'forum/topic/postTools', 'forum/topic/events', 'navigator'], function(pagination, infinitescroll, threadTools, postTools, events, navigator) {
 	var	Topic = {},
 		scrollingToPost = false,
 		currentUrl = '';
diff --git a/public/src/forum/topic/browsing.js b/public/src/forum/topic/browsing.js
index 460d450e96..ba7f33f2bf 100644
--- a/public/src/forum/topic/browsing.js
+++ b/public/src/forum/topic/browsing.js
@@ -4,7 +4,7 @@
 
 /* globals define, app, translator, config, socket, ajaxify */
 
-define(function() {
+define('forum/topic/browsing', function() {
 
 	var Browsing = {};
 
diff --git a/public/src/forum/topic/events.js b/public/src/forum/topic/events.js
index 04336c0cca..b5d0a06536 100644
--- a/public/src/forum/topic/events.js
+++ b/public/src/forum/topic/events.js
@@ -3,7 +3,7 @@
 
 /* globals app, ajaxify, define, socket */
 
-define(['forum/topic/browsing', 'forum/topic/postTools', 'forum/topic/threadTools'], function(browsing, postTools, threadTools) {
+define('forum/topic/events', ['forum/topic/browsing', 'forum/topic/postTools', 'forum/topic/threadTools'], function(browsing, postTools, threadTools) {
 
 	var Events = {};
 
diff --git a/public/src/forum/topic/fork.js b/public/src/forum/topic/fork.js
index 13cdb54adb..dde247baa7 100644
--- a/public/src/forum/topic/fork.js
+++ b/public/src/forum/topic/fork.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, translator, socket */
 
-define(function() {
+define('forum/topic/fork', function() {
 
 	var Fork = {},
 		forkModal,
diff --git a/public/src/forum/topic/move.js b/public/src/forum/topic/move.js
index ed8d959521..2736f512f8 100644
--- a/public/src/forum/topic/move.js
+++ b/public/src/forum/topic/move.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, socket */
 
-define(function() {
+define('forum/topic/move', function() {
 
 	var Move = {},
 		modal,
diff --git a/public/src/forum/topic/postTools.js b/public/src/forum/topic/postTools.js
index 347e7bd91e..95aa1a7221 100644
--- a/public/src/forum/topic/postTools.js
+++ b/public/src/forum/topic/postTools.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, translator, ajaxify, socket, bootbox */
 
-define(['composer', 'share', 'navigator'], function(composer, share, navigator) {
+define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(composer, share, navigator) {
 
 	var PostTools = {},
 		topicName;
diff --git a/public/src/forum/topic/threadTools.js b/public/src/forum/topic/threadTools.js
index 7f6fe6a4b7..fed6eb2034 100644
--- a/public/src/forum/topic/threadTools.js
+++ b/public/src/forum/topic/threadTools.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, translator, ajaxify, socket, bootbox */
 
-define(['forum/topic/fork', 'forum/topic/move'], function(fork, move) {
+define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], function(fork, move) {
 
 	var ThreadTools = {};
 
diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js
index a289290710..44d1a24f8d 100644
--- a/public/src/forum/unread.js
+++ b/public/src/forum/unread.js
@@ -2,7 +2,7 @@
 
 /* globals define, app, socket */
 
-define(['forum/recent', 'topicSelect', 'forum/infinitescroll'], function(recent, topicSelect, infinitescroll) {
+define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], function(recent, topicSelect, infinitescroll) {
 	var Unread = {};
 
 	$(window).on('action:ajaxify.start', function(ev, data) {
diff --git a/public/src/forum/users.js b/public/src/forum/users.js
index 2187e40ccf..7f8eee3647 100644
--- a/public/src/forum/users.js
+++ b/public/src/forum/users.js
@@ -1,4 +1,4 @@
-define(function() {
+define('forum/users', function() {
 	var	Users = {};
 
 	Users.init = function() {
diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js
index 6516dc48ea..d4d9c83627 100644
--- a/public/src/modules/alerts.js
+++ b/public/src/modules/alerts.js
@@ -1,7 +1,7 @@
 'use strict';
 /* globals define, translator, templates */
 
-define(function() {
+define('alerts', function() {
 
 	var module = {};
 
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 4d99a202f3..a9ec7addcb 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -1,7 +1,7 @@
 "use strict";
 /* globals app, config, define, socket, translator, templates, utils */
 
-define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
+define('chat', ['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
 
 	var module = {};
 
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 40df400a9e..d08f7d24c8 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -2,7 +2,7 @@
 
 /* globals define, socket, app, config, ajaxify, utils, translator, templates, bootbox */
 
-define(['taskbar', 'composer/controls', 'composer/uploads', 'composer/formatting', 'composer/drafts', 'composer/tags'], function(taskbar, controls, uploads, formatting, drafts, tags) {
+define('composer', ['taskbar', 'composer/controls', 'composer/uploads', 'composer/formatting', 'composer/drafts', 'composer/tags'], function(taskbar, controls, uploads, formatting, drafts, tags) {
 	var composer = {
 		active: undefined,
 		posts: {}
diff --git a/public/src/modules/composer/controls.js b/public/src/modules/composer/controls.js
index ca6c436972..05b6bdcf3c 100644
--- a/public/src/modules/composer/controls.js
+++ b/public/src/modules/composer/controls.js
@@ -2,7 +2,7 @@
 
 /*global define*/
 
-define(function() {
+define('composer/controls', function() {
 	var controls = {};
 
 	/*************************************************/
diff --git a/public/src/modules/composer/drafts.js b/public/src/modules/composer/drafts.js
index 807f9d14ca..d355cfa054 100644
--- a/public/src/modules/composer/drafts.js
+++ b/public/src/modules/composer/drafts.js
@@ -2,7 +2,7 @@
 
 /* globals define */
 
-define(function() {
+define('composer/drafts', function() {
 
 	var drafts = {};
 
diff --git a/public/src/modules/composer/formatting.js b/public/src/modules/composer/formatting.js
index 6eb54b25b4..e1495cb02f 100644
--- a/public/src/modules/composer/formatting.js
+++ b/public/src/modules/composer/formatting.js
@@ -2,7 +2,7 @@
 
 /* globals define */
 
-define(['composer/controls'], function(controls) {
+define('composer/formatting', ['composer/controls'], function(controls) {
 
 	var formatting = {};
 
diff --git a/public/src/modules/composer/tags.js b/public/src/modules/composer/tags.js
index e5b1a34b83..e1c1ce7e5d 100644
--- a/public/src/modules/composer/tags.js
+++ b/public/src/modules/composer/tags.js
@@ -3,7 +3,7 @@
 
 /*globals define*/
 
-define(function() {
+define('composer/tags', function() {
 	var tags = {};
 
 	tags.init = function(postContainer, postData) {
diff --git a/public/src/modules/composer/uploads.js b/public/src/modules/composer/uploads.js
index 44baa2a73f..b61d962d2f 100644
--- a/public/src/modules/composer/uploads.js
+++ b/public/src/modules/composer/uploads.js
@@ -2,7 +2,7 @@
 
 /* globals define, utils, config, app */
 
-define(function() {
+define('composer/uploads', function() {
 	var uploads = {};
 
 	uploads.initialize = function(post_uuid) {
diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index 3c8baa6244..21a4a982f1 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -4,7 +4,7 @@
 /* globals app, define, ajaxify */
 
 
-define(function() {
+define('navigator', function() {
 
 	var navigator = {};
 	var index = 1;
diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js
index 2b7a8910e5..8553f55280 100644
--- a/public/src/modules/notifications.js
+++ b/public/src/modules/notifications.js
@@ -3,7 +3,7 @@
 /* globals define, socket, translator, utils, config, app, ajaxify, Tinycon*/
 
 
-define(['sounds'], function(sound) {
+define('notifications', ['sounds'], function(sound) {
 	var Notifications = {};
 
 	Notifications.prepareDOM = function() {
diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js
index 56636b9489..df3b76e182 100644
--- a/public/src/modules/settings.js
+++ b/public/src/modules/settings.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define, app, socket*/
 
-define(function () {
+define('settings', function () {
 
 	var DEFAULT_PLUGINS = [
 		'settings/checkbox',
diff --git a/public/src/modules/settings/array.js b/public/src/modules/settings/array.js
index eb511b9f7a..81071a65fa 100644
--- a/public/src/modules/settings/array.js
+++ b/public/src/modules/settings/array.js
@@ -1,4 +1,4 @@
-define(function () {
+define('settings/array', function () {
 
 	var Settings = null,
 		SettingsArray,
diff --git a/public/src/modules/settings/checkbox.js b/public/src/modules/settings/checkbox.js
index 98d8767417..1f6fc8c125 100644
--- a/public/src/modules/settings/checkbox.js
+++ b/public/src/modules/settings/checkbox.js
@@ -1,4 +1,4 @@
-define(function () {
+define('settings/checkbox', function () {
 
 	var Settings = null,
 		SettingsCheckbox;
diff --git a/public/src/modules/settings/key.js b/public/src/modules/settings/key.js
index d405b65cf5..c5cac01103 100644
--- a/public/src/modules/settings/key.js
+++ b/public/src/modules/settings/key.js
@@ -1,4 +1,4 @@
-define(function () {
+define('settings/key', function () {
 
 	var Settings = null,
 		SettingsKey,
diff --git a/public/src/modules/settings/number.js b/public/src/modules/settings/number.js
index 5c98a86abc..ed96008038 100644
--- a/public/src/modules/settings/number.js
+++ b/public/src/modules/settings/number.js
@@ -1,4 +1,4 @@
-define(function () {
+define('settings/number', function () {
 
 	return {
 		types: ['number'],
diff --git a/public/src/modules/settings/select.js b/public/src/modules/settings/select.js
index 9ccff8ccb7..5e62b27226 100644
--- a/public/src/modules/settings/select.js
+++ b/public/src/modules/settings/select.js
@@ -1,4 +1,4 @@
-define(function () {
+define('settings/select', function () {
 
 	var Settings = null,
 		SettingsSelect;
diff --git a/public/src/modules/settings/textarea.js b/public/src/modules/settings/textarea.js
index ceeca49f99..8f1bcd90ca 100644
--- a/public/src/modules/settings/textarea.js
+++ b/public/src/modules/settings/textarea.js
@@ -1,4 +1,4 @@
-define(function () {
+define('settings/textarea', function () {
 
 	var Settings = null,
 		SettingsArea;
diff --git a/public/src/modules/share.js b/public/src/modules/share.js
index 4c3c20a687..2cbb16889e 100644
--- a/public/src/modules/share.js
+++ b/public/src/modules/share.js
@@ -2,7 +2,7 @@
 
 /* globals define */
 
-define(function() {
+define('share', function() {
 
 	var module = {};
 
diff --git a/public/src/modules/sounds.js b/public/src/modules/sounds.js
index c4c8262abe..01ad4ec2a8 100644
--- a/public/src/modules/sounds.js
+++ b/public/src/modules/sounds.js
@@ -1,7 +1,7 @@
 "use strict";
 /* global define, socket, config */
 
-define(['buzz'], function(buzz) {
+define('sounds', ['buzz'], function(buzz) {
 	var	Sounds = {};
 
 	var loadedSounds = {};
diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js
index 3f7ac91ed5..605a85e62a 100644
--- a/public/src/modules/taskbar.js
+++ b/public/src/modules/taskbar.js
@@ -1,4 +1,4 @@
-define(function() {
+define('taskbar', function() {
 	var taskbar = {
 		initialized: false,
 		init: function() {
diff --git a/public/src/modules/topicSelect.js b/public/src/modules/topicSelect.js
index a5b131a7a2..7aa0b1f43a 100644
--- a/public/src/modules/topicSelect.js
+++ b/public/src/modules/topicSelect.js
@@ -2,7 +2,7 @@
 
 /* globals define*/
 
-define(function() {
+define('topicSelect', function() {
 	var TopicSelect = {};
 	var lastSelected;
 
diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
index a34ce0b08c..64403f52fe 100644
--- a/public/src/modules/uploader.js
+++ b/public/src/modules/uploader.js
@@ -1,4 +1,4 @@
-define(function() {
+define('uploader', function() {
 
 	var module = {},
 		maybeParse = function(response) {
diff --git a/src/meta.js b/src/meta.js
index 8df7667a21..76b3ca8b75 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -250,9 +250,37 @@ var fs = require('fs'),
 			'src/widgets.js',
 			'src/translator.js',
 			'src/helpers.js',
-			'src/overrides.js'
+			'src/overrides.js',
 		],
 		minFile: 'nodebb.min.js',
+		loadRJS: function(callback) {
+			//return callback();
+
+			var rjsPath = path.join(__dirname, '..', '/public/src');
+
+			async.parallel({
+				forum: function(next) {
+					utils.walk(path.join(rjsPath, 'forum'), next);
+				},
+				modules: function(next) {
+					utils.walk(path.join(rjsPath, 'modules'), next);
+				}
+			}, function(err, rjsFiles) {
+				rjsFiles = rjsFiles.forum.concat(rjsFiles.modules);
+
+				rjsFiles = rjsFiles.map(function(file) {
+					return path.join('src', file.replace(rjsPath, ''));
+				});
+
+				Meta.js.scripts = Meta.js.scripts.concat(rjsFiles);
+
+				// todo: not sure how to convert string.js
+				Meta.js.scripts.splice(Meta.js.scripts.indexOf(path.join('src/modules/string.js'), 1));
+
+				console.log(Meta.js.scripts);
+				callback(err);
+			});
+		},
 		prepare: function (callback) {
 			plugins.fireHook('filter:scripts.get', this.scripts, function(err, scripts) {
 				var ctime,
@@ -310,10 +338,12 @@ var fs = require('fs'),
 				}
 			});
 
-			this.prepare(function() {
-				minifier.send({
-					action: minify ? 'js.minify' : 'js.concatenate',
-					scripts: Meta.js.scripts
+			Meta.js.loadRJS(function() {
+				Meta.js.prepare(function() {
+					minifier.send({
+						action: minify ? 'js.minify' : 'js.concatenate',
+						scripts: Meta.js.scripts
+					});
 				});
 			});
 		},