diff --git a/app.js b/app.js
index d83bb95d36..4f110f1c80 100644
--- a/app.js
+++ b/app.js
@@ -121,7 +121,7 @@ function start() {
 
 	require('./src/database').init(function(err) {
 		meta.configs.init(function () {
-			var templates = require('./public/src/templates'),
+			var templates = require('templates.js'),
 				webserver = require('./src/webserver'),
 				sockets = require('./src/socket.io'),
 				plugins = require('./src/plugins'),
diff --git a/public/src/helpers.js b/public/src/helpers.js
index ca81347a23..7e8bd64280 100644
--- a/public/src/helpers.js
+++ b/public/src/helpers.js
@@ -26,7 +26,7 @@
 	}
 
 	module.exports = function() {
-		var templates = templates || require('./templates');
+		var templates = templates || require('templates.js');
 
 		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
 		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
diff --git a/src/emailer.js b/src/emailer.js
index 5576e2a73c..a328c609da 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -4,11 +4,11 @@ var	fs = require('fs'),
 	async = require('async'),
 	path = require('path'),
 	winston = require('winston'),
+	templates = require('templates.js'),
 
 	User = require('./user'),
 	Plugins = require('./plugins'),
 	Meta = require('./meta'),
-	templates = require('../public/src/templates'),
 
 	app = {},
 	Emailer = {};
diff --git a/src/meta.js b/src/meta.js
index 5713f12a6d..3a85243f77 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -245,15 +245,15 @@ var fs = require('fs'),
 			'vendor/xregexp/xregexp.js',
 			'vendor/xregexp/unicode/unicode-base.js',
 			'vendor/buzz/buzz.min.js',
+			'../node_modules/templates.js/lib/templates.js',
 			'src/utils.js',
 			'src/app.js',
-			'src/templates.js',
 			'src/ajaxify.js',
 			'src/variables.js',
 			'src/widgets.js',
 			'src/translator.js',
 			'src/helpers.js',
-			'src/overrides.js',
+			'src/overrides.js'
 		],
 		minFile: 'nodebb.min.js',
 		loadRJS: function(callback) {
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 022795766e..844e46cdd8 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -1,7 +1,6 @@
 "use strict";
 
-var templates = require('./../../public/src/templates'),
-	utils = require('./../../public/src/utils'),
+var utils = require('./../../public/src/utils'),
 	meta = require('./../meta'),
 	plugins = require('./../plugins'),
 	db = require('./../database'),
@@ -15,6 +14,7 @@ var templates = require('./../../public/src/templates'),
 	express = require('express'),
 	winston = require('winston'),
 	flash = require('connect-flash'),
+	templates = require('templates.js'),
 
 	relativePath,
 	viewsPath,
diff --git a/src/widgets.js b/src/widgets.js
index 48e16a172a..bc1910a95f 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -2,9 +2,10 @@
 
 var async = require('async'),
 	winston = require('winston'),
+	templates = require('templates.js'),
+	
 	plugins = require('./plugins'),
-	db = require('./database'),
-	templates = require('./../public/src/templates');
+	db = require('./database');
 
 
 (function(Widgets) {