diff --git a/package.json b/package.json
index da8c87aedd..e88a68efbd 100644
--- a/package.json
+++ b/package.json
@@ -156,6 +156,8 @@
           "src/components/syncPlay/playbackPermissionManager.js",
           "src/components/syncPlay/syncPlayManager.js",
           "src/components/syncPlay/timeSyncManager.js",
+          "src/components/toast/toast.js",
+          "src/components/upnextdialog/upnextdialog.js",
           "src/controllers/session/addServer/index.js",
           "src/controllers/session/forgotPassword/index.js",
           "src/controllers/session/redeemPassword/index.js",
diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js
index 7b8e49e4d2..36226ab8e3 100644
--- a/src/components/toast/toast.js
+++ b/src/components/toast/toast.js
@@ -1,42 +1,40 @@
-define(['css!./toast'], function () {
-    'use strict';
+import 'css!./toast';
 
-    function remove(elem) {
+function remove(elem) {
 
-        setTimeout(function () {
-            elem.parentNode.removeChild(elem);
-        }, 300);
+    setTimeout(function () {
+        elem.parentNode.removeChild(elem);
+    }, 300);
+}
+
+function animateRemove(elem) {
+
+    setTimeout(function () {
+
+        elem.classList.remove('toastVisible');
+        remove(elem);
+
+    }, 3300);
+}
+
+export default function (options) {
+
+    if (typeof options === 'string') {
+        options = {
+            text: options
+        };
     }
 
-    function animateRemove(elem) {
+    var elem = document.createElement('div');
+    elem.classList.add('toast');
+    elem.innerHTML = options.text;
 
-        setTimeout(function () {
+    document.body.appendChild(elem);
 
-            elem.classList.remove('toastVisible');
-            remove(elem);
+    setTimeout(function () {
+        elem.classList.add('toastVisible');
 
-        }, 3300);
-    }
+        animateRemove(elem);
 
-    return function (options) {
-
-        if (typeof options === 'string') {
-            options = {
-                text: options
-            };
-        }
-
-        var elem = document.createElement('div');
-        elem.classList.add('toast');
-        elem.innerHTML = options.text;
-
-        document.body.appendChild(elem);
-
-        setTimeout(function () {
-            elem.classList.add('toastVisible');
-
-            animateRemove(elem);
-
-        }, 300);
-    };
-});
+    }, 300);
+}
diff --git a/src/components/upnextdialog/upnextdialog.js b/src/components/upnextdialog/upnextdialog.js
index 3e9c9f9c5e..e45b3d5951 100644
--- a/src/components/upnextdialog/upnextdialog.js
+++ b/src/components/upnextdialog/upnextdialog.js
@@ -1,5 +1,17 @@
-define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'layoutManager', 'focusManager', 'globalize', 'itemHelper', 'css!./upnextdialog', 'emby-button', 'flexStyles'], function (dom, playbackManager, connectionManager, events, mediaInfo, layoutManager, focusManager, globalize, itemHelper) {
-    'use strict';
+import dom from 'dom';
+import playbackManager from 'playbackManager';
+import connectionManager from 'connectionManager';
+import events from 'events';
+import mediaInfo from 'mediaInfo';
+import layoutManager from 'layoutManager';
+import focusManager from 'focusManager';
+import globalize from 'globalize';
+import itemHelper from 'itemHelper';
+import 'css!./upnextdialog';
+import 'emby-button';
+import 'flexStyles';
+
+/* eslint-disable indent */
 
     var transitionEndEventName = dom.whichTransitionEvent();
 
@@ -289,14 +301,14 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
         instance._countdownTextTimeout = setInterval(setNextVideoText.bind(instance), 400);
     }
 
-    function UpNextDialog(options) {
+class UpNextDialog {
+    constructor(options) {
 
         this.options = options;
 
         init(this, options);
     }
-
-    UpNextDialog.prototype.show = function () {
+    show() {
 
         var elem = this.options.parent;
 
@@ -316,20 +328,20 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
         }
 
         startComingUpNextHideTimer(this);
-    };
-
-    UpNextDialog.prototype.hide = function () {
+    }
+    hide() {
 
         hideComingUpNext.call(this);
-    };
-
-    UpNextDialog.prototype.destroy = function () {
+    }
+    destroy() {
 
         hideComingUpNext.call(this);
 
         this.options = null;
         this.itemType = null;
-    };
+    }
+}
 
-    return UpNextDialog;
-});
+export default UpNextDialog;
+
+/* eslint-enable indent */