diff --git a/package.json b/package.json
index 24574d83d3..16a94df5bf 100644
--- a/package.json
+++ b/package.json
@@ -142,6 +142,7 @@
           "src/scripts/keyboardNavigation.js",
           "src/scripts/settings/appSettings.js",
           "src/scripts/settings/userSettings.js",
+          "src/scripts/themeLoader.js",
           "src/scripts/settings/webSettings.js"
         ],
         "plugins": [
diff --git a/src/components/groupedcards.js b/src/components/groupedcards.js
index 2412e0f733..719a599a60 100644
--- a/src/components/groupedcards.js
+++ b/src/components/groupedcards.js
@@ -4,8 +4,6 @@ import dom from 'dom';
 import appRouter from 'appRouter';
 import connectionManager from 'connectionManager';
 
-    'use strict';
-
     function onGroupedCardClick(e, card) {
         var itemId = card.getAttribute('data-id');
         var serverId = card.getAttribute('data-serverid');
@@ -43,3 +41,5 @@ import connectionManager from 'connectionManager';
             onGroupedCardClick(e, groupedCard);
         }
     }
+
+    /* eslint-enable indent */
diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js
index 4ff44cdcf9..062c80efa6 100644
--- a/src/components/htmlMediaHelper.js
+++ b/src/components/htmlMediaHelper.js
@@ -4,8 +4,6 @@ import appSettings from 'appSettings' ;
 import browser from 'browser';
 import events from 'events';
 
-    'use strict';
-
     export function getSavedVolume() {
         return appSettings.get('volume') || 1;
     }
@@ -467,4 +465,4 @@ import events from 'events';
         return ranges;
     }
 
-
+/* eslint-enable indent */
diff --git a/src/scripts/themeLoader.js b/src/scripts/themeLoader.js
index f75d6d0e29..b071ee6781 100644
--- a/src/scripts/themeLoader.js
+++ b/src/scripts/themeLoader.js
@@ -1,27 +1,30 @@
-define(['userSettings', 'skinManager', 'connectionManager', 'events'], function (userSettings, skinManager, connectionManager, events) {
-    'use strict';
+import * as userSettings from 'userSettings';
+import skinManager from 'skinManager';
+import connectionManager from 'connectionManager';
+import events from 'events';
 
-    var currentViewType;
-    pageClassOn('viewbeforeshow', 'page', function () {
-        var classList = this.classList;
-        var viewType = classList.contains('type-interior') || classList.contains('wizardPage') ? 'a' : 'b';
+var currentViewType;
+pageClassOn('viewbeforeshow', 'page', function () {
+    var classList = this.classList;
+    var viewType = classList.contains('type-interior') || classList.contains('wizardPage') ? 'a' : 'b';
 
-        if (viewType !== currentViewType) {
-            currentViewType = viewType;
-            var theme;
-            var context;
+    if (viewType !== currentViewType) {
+        currentViewType = viewType;
+        var theme;
+        var context;
 
-            if ('a' === viewType) {
-                theme = userSettings.dashboardTheme();
-                context = 'serverdashboard';
-            } else {
-                theme = userSettings.theme();
-            }
-
-            skinManager.setTheme(theme, context);
+        if ('a' === viewType) {
+            theme = userSettings.dashboardTheme();
+            context = 'serverdashboard';
+        } else {
+            theme = userSettings.theme();
         }
-    });
-    events.on(connectionManager, 'localusersignedin', function (e, user) {
-        currentViewType = null;
-    });
+
+        skinManager.setTheme(theme, context);
+    }
 });
+
+events.on(connectionManager, 'localusersignedin', function (e, user) {
+    currentViewType = null;
+});
+