diff --git a/install/data/navigation.json b/install/data/navigation.json
index 0ec72805de..8c7965dc7e 100644
--- a/install/data/navigation.json
+++ b/install/data/navigation.json
@@ -1,71 +1,71 @@
 [
 	{
 		"route": "/categories",
-		"title": "\\[\\[global:header.categories\\]\\]",
+		"title": "[[global:header.categories]]",
 		"enabled": true,
 		"iconClass": "fa-list",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.categories\\]\\]"
+		"text": "[[global:header.categories]]"
 	},
 	{
 		"id": "unread-count",
 		"route": "/unread",
-		"title": "\\[\\[global:header.unread\\]\\]",
+		"title": "[[global:header.unread]]",
 		"enabled": true,
 		"iconClass": "fa-inbox",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.unread\\]\\]",
+		"text": "[[global:header.unread]]",
 		"properties": {
 			"loggedIn": true
 		}
 	},
 	{
 		"route": "/recent",
-		"title": "\\[\\[global:header.recent\\]\\]",
+		"title": "[[global:header.recent]]",
 		"enabled": true,
 		"iconClass": "fa-clock-o",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.recent\\]\\]"
+		"text": "[[global:header.recent]]"
 	},
 	{
 		"route": "/tags",
-		"title": "\\[\\[global:header.tags\\]\\]",
+		"title": "[[global:header.tags]]",
 		"enabled": true,
 		"iconClass": "fa-tags",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.tags\\]\\]"
+		"text": "[[global:header.tags]]"
 	},
 	{
 		"route": "/popular",
-		"title": "\\[\\[global:header.popular\\]\\]",
+		"title": "[[global:header.popular]]",
 		"enabled": true,
 		"iconClass": "fa-fire",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.popular\\]\\]"
+		"text": "[[global:header.popular]]"
 	},
 	{
 		"route": "/users",
-		"title": "\\[\\[global:header.users\\]\\]",
+		"title": "[[global:header.users]]",
 		"enabled": true,
 		"iconClass": "fa-user",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.users\\]\\]"
+		"text": "[[global:header.users]]"
 	},
 	{
 		"route": "/groups",
-		"title": "\\[\\[global:header.groups\\]\\]",
+		"title": "[[global:header.groups]]",
 		"enabled": true,
 		"iconClass": "fa-group",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.groups\\]\\]"
+		"text": "[[global:header.groups]]"
 	},
 	{
 		"route": "/admin",
-		"title": "\\[\\[global:header.admin\\]\\]",
+		"title": "[[global:header.admin]]",
 		"enabled": true,
 		"iconClass": "fa-cogs",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.admin\\]\\]",
+		"text": "[[global:header.admin]]",
 		"properties": {
 			"targetBlank": false,
 			"adminOnly": true
@@ -73,11 +73,11 @@
 	},
 	{
 		"route": "/search",
-		"title": "\\[\\[global:header.search\\]\\]",
+		"title": "[[global:header.search]]",
 		"enabled": true,
 		"iconClass": "fa-search",
 		"textClass": "visible-xs-inline",
-		"text": "\\[\\[global:header.search\\]\\]",
+		"text": "[[global:header.search]]",
 		"properties": {
 			"searchInstalled": true
 		}
diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index 7ec41a553b..0b6867b81c 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -231,4 +231,10 @@
 			});
 		});
 	}
+
+	// tell ace to use the right paths when requiring modules
+	require(['ace/ace'], function (ace) {
+		ace.config.set('packaged', true);
+		ace.config.set('basePath', config.relative_path + '/assets/src/modules/ace/');
+	});
 }());
diff --git a/public/src/admin/appearance/customise.js b/public/src/admin/appearance/customise.js
index a8fc5282cd..268d8480af 100644
--- a/public/src/admin/appearance/customise.js
+++ b/public/src/admin/appearance/customise.js
@@ -1,6 +1,5 @@
 'use strict';
 
-
 define('admin/appearance/customise', ['admin/settings', 'ace/ace'], function (Settings, ace) {
 	var Customise = {};
 
diff --git a/public/src/admin/settings/email.js b/public/src/admin/settings/email.js
index ca454ab1ba..d25fa05c30 100644
--- a/public/src/admin/settings/email.js
+++ b/public/src/admin/settings/email.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/settings/email', ['admin/settings', 'ace/ace'], function (ace) {
+define('admin/settings/email', ['ace/ace', 'admin/settings'], function (ace) {
 	var module = {};
 	var emailEditor;
 
diff --git a/src/languages.js b/src/languages.js
index 0769656519..c4c3d5ae0e 100644
--- a/src/languages.js
+++ b/src/languages.js
@@ -31,6 +31,9 @@ Languages.list = function (callback) {
 	var languages = [];
 
 	fs.readdir(languagesPath, function (err, files) {
+		if (err && err.code === 'ENOENT') {
+			return callback(null, []);
+		}
 		if (err) {
 			return callback(err);
 		}