diff --git a/package.json b/package.json
index e709bc5665..2dd8516d4b 100644
--- a/package.json
+++ b/package.json
@@ -106,10 +106,8 @@
           "src/components/dialog/dialog.js",
           "src/components/dialogHelper/dialogHelper.js",
           "src/components/directorybrowser/directorybrowser.js",
-          "src/components/directorybrowser/directorybrowser.js",
           "src/components/displaySettings/displaySettings.js",
           "src/components/fetchhelper.js",
-          "src/components/fetchhelper.js",
           "src/components/filterdialog/filterdialog.js",
           "src/components/filterdialog/filterdialog.js",
           "src/components/groupedcards.js",
@@ -182,7 +180,6 @@
           "src/controllers/dashboard/networking.js",
           "src/controllers/dashboard/playback.js",
           "src/controllers/dashboard/plugins/repositories.js",
-          "src/controllers/dashboard/plugins/repositories.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtask.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
           "src/controllers/dashboard/serveractivity.js",
@@ -221,18 +218,15 @@
           "src/elements/emby-collapse/emby-collapse.js",
           "src/elements/emby-input/emby-input.js",
           "src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js",
-          "src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js",
           "src/elements/emby-itemscontainer/emby-itemscontainer.js",
           "src/elements/emby-playstatebutton/emby-playstatebutton.js",
           "src/elements/emby-programcell/emby-programcell.js",
           "src/elements/emby-progressbar/emby-progressbar.js",
           "src/elements/emby-progressring/emby-progressring.js",
           "src/elements/emby-radio/emby-radio.js",
-          "src/elements/emby-radio/emby-radio.js",
           "src/elements/emby-ratingbutton/emby-ratingbutton.js",
           "src/elements/emby-scrollbuttons/emby-scrollbuttons.js",
           "src/elements/emby-scroller/emby-scroller.js",
-          "src/elements/emby-scroller/emby-scroller.js",
           "src/elements/emby-select/emby-select.js",
           "src/elements/emby-tabs/emby-tabs.js",
           "src/elements/emby-textarea/emby-textarea.js",
diff --git a/src/components/groupedcards.js b/src/components/groupedcards.js
index 3c474d9f6e..8ac3cc799c 100644
--- a/src/components/groupedcards.js
+++ b/src/components/groupedcards.js
@@ -34,7 +34,7 @@ import connectionManager from 'connectionManager';
         }
     }
 
-    export function onItemsContainerClick(e) {
+    export default function onItemsContainerClick(e) {
         var groupedCard = dom.parentWithClass(e.target, 'groupedCard');
 
         if (groupedCard) {
diff --git a/src/components/metadataEditor/personEditor.js b/src/components/metadataEditor/personEditor.js
index 028cea9d80..2349f40e7b 100644
--- a/src/components/metadataEditor/personEditor.js
+++ b/src/components/metadataEditor/personEditor.js
@@ -10,7 +10,7 @@ import 'css!./../formdialog';
 /* eslint-disable indent */
 
     function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
+        import('scrollHelper').then(({default: scrollHelper}) => {
             const fn = on ? 'on' : 'off';
             scrollHelper.centerFocus[fn](elem, horiz);
         });
@@ -19,7 +19,7 @@ import 'css!./../formdialog';
     function show(person) {
         return new Promise(function (resolve, reject) {
 
-            require(['text!./personEditor.template.html'], function (template) {
+            import('text!./personEditor.template.html').then(({default: template}) => {
 
                 const dialogOptions = {
                     removeOnClose: true,
diff --git a/src/controllers/dashboard/dlna/profile.js b/src/controllers/dashboard/dlna/profile.js
index 003cb88245..da5d62d8f8 100644
--- a/src/controllers/dashboard/dlna/profile.js
+++ b/src/controllers/dashboard/dlna/profile.js
@@ -256,8 +256,7 @@ import 'listViewStyle';
         html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
         let currentType;
 
-        for (let i = 0, length = profiles.length; i < length; i++) {
-            const profile = profiles[i];
+        for (const profile of profiles) {
 
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
diff --git a/src/controllers/dashboard/users/useredit.js b/src/controllers/dashboard/users/useredit.js
index c67be6363e..823ecb0c6b 100644
--- a/src/controllers/dashboard/users/useredit.js
+++ b/src/controllers/dashboard/users/useredit.js
@@ -14,15 +14,13 @@ import globalize from 'globalize';
             let checkedAttribute;
             let html = '';
 
-            for (let i = 0, length = mediaFolders.length; i < length; i++) {
-                folder = mediaFolders[i];
+            for (const folder of mediaFolders) {
                 isChecked = user.Policy.EnableContentDeletion || -1 != user.Policy.EnableContentDeletionFromFolders.indexOf(folder.Id);
                 checkedAttribute = isChecked ? ' checked="checked"' : '';
                 html += '<label><input type="checkbox" is="emby-checkbox" class="chkFolder" data-id="' + folder.Id + '" ' + checkedAttribute + '><span>' + folder.Name + '</span></label>';
             }
 
-            for (let i = 0, length = channelsResult.Items.length; i < length; i++) {
-                folder = channelsResult.Items[i];
+            for (const folder of channelsResult) {
                 isChecked = user.Policy.EnableContentDeletion || -1 != user.Policy.EnableContentDeletionFromFolders.indexOf(folder.Id);
                 checkedAttribute = isChecked ? ' checked="checked"' : '';
                 html += '<label><input type="checkbox" is="emby-checkbox" class="chkFolder" data-id="' + folder.Id + '" ' + checkedAttribute + '><span>' + folder.Name + '</span></label>';
diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js
index f48b91d68f..d686a62197 100644
--- a/src/controllers/shows/tvgenres.js
+++ b/src/controllers/shows/tvgenres.js
@@ -144,8 +144,7 @@ import 'emby-button';
                 let html = '';
                 const items = result.Items;
 
-                for (let i = 0, length = items.length; i < length; i++) {
-                    const item = items[i];
+                for (const item of items) {
                     html += '<div class="verticalSection">';
                     html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
                     html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl(item, {
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index fb893c9bae..7edd2ab501 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -220,6 +220,7 @@ import 'emby-button';
 
                 case 7:
                     depends = 'scripts/searchtab';
+                    break;
             }
 
             import(depends).then(({default: controllerFactory}) => {