diff --git a/core/server/themes/active.js b/core/server/themes/active.js
index 97f1a4d268..db32f30fbe 100644
--- a/core/server/themes/active.js
+++ b/core/server/themes/active.js
@@ -21,7 +21,6 @@ var _ = require('lodash'),
     themeConfig = require('./config'),
     config = require('../config'),
     engine = require('./engine'),
-    _ = require('lodash'),
     // Current instance of ActiveTheme
     currentActiveTheme;
 
diff --git a/core/server/themes/to-json.js b/core/server/themes/to-json.js
index d8dd205d48..7e18cda84e 100644
--- a/core/server/themes/to-json.js
+++ b/core/server/themes/to-json.js
@@ -19,8 +19,9 @@ module.exports = function toJSON(name, checkedTheme) {
         themeResult = packages.filterPackages(toFilter, settingsCache.get('active_theme'));
     } else {
         // If we pass in a gscan result, convert this instead
-        toFilter = {};
-        toFilter[name] = themeList.get(name);
+        toFilter = {
+            [name]: themeList.get(name)
+        };
 
         themeResult = packages.filterPackages(toFilter, settingsCache.get('active_theme'));
 
diff --git a/core/server/translations/en.json b/core/server/translations/en.json
index 46f6c5eaf8..1b28e08539 100644
--- a/core/server/translations/en.json
+++ b/core/server/translations/en.json
@@ -107,7 +107,7 @@
             "themehandler": {
                 "missingTheme": "The currently active theme \"{theme}\" is missing.",
                 "invalidTheme": "The currently active theme \"{theme}\" is invalid.",
-                "themeHasErrors": "The currently active theme has errors, but theme still works."
+                "themeHasErrors": "The currently active theme \"{theme}\" has errors, but will still work."
             }
         },
         "utils": {