diff --git a/src/bundle.js b/src/bundle.js
index 6931b34dd..5d18426b5 100644
--- a/src/bundle.js
+++ b/src/bundle.js
@@ -4,12 +4,6 @@
 // Use define from require.js not webpack's define
 var _define = window.define;
 
-// document-register-element
-var docRegister = require("document-register-element");
-_define("document-register-element", function() {
-    return docRegister;
-});
-
 // fetch
 var fetch = require("whatwg-fetch");
 _define("fetch", function() {
@@ -78,12 +72,6 @@ _define("sortable", function() {
     return sortable;
 });
 
-// webcomponents
-var webcomponents = require("webcomponents.js-2");
-_define("webcomponents", function() {
-    return webcomponents
-});
-
 // libjass
 var libjass = require("libjass");
 require("libjass/libjass.css");
diff --git a/src/scripts/site.js b/src/scripts/site.js
index e05712c07..6e1470dfe 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -410,9 +410,9 @@ var AppInfo = {};
         if ("registerElement" in document) {
             define("registerElement", []);
         } else if (browser.msie) {
-            define("registerElement", ["webcomponents"], returnFirstDependency);
+            define("registerElement", [bowerPath + "/webcomponents-lite.min.js"], returnFirstDependency);
         } else {
-            define("registerElement", ["document-register-element"], returnFirstDependency);
+            define("registerElement", [bowerPath + "/document-register-element"], returnFirstDependency);
         }
 
         define("imageFetcher", [componentsPath + "/images/imageFetcher"], returnFirstDependency);
@@ -681,7 +681,6 @@ var AppInfo = {};
             },
             bundles: {
                 bundle: [
-                    "document-register-element",
                     "fetch",
                     "flvjs",
                     "jstree",
@@ -694,7 +693,6 @@ var AppInfo = {};
                     "swiper",
                     "sortable",
                     "libjass",
-                    "webcomponents"
                 ]
             },
             urlArgs: urlArgs,
diff --git a/webpack.common.js b/webpack.common.js
index 59a1c4e55..852b0e3af 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -5,7 +5,9 @@ const CopyPlugin = require("copy-webpack-plugin");
 
 const Assets = [
     "alameda/alameda.js",
-    "requirejs/require.js"
+    "requirejs/require.js",
+    "webcomponents.js-2/webcomponents-lite.min.js",
+    "document-register-element/build/document-register-element.js",
 ];
 
 module.exports = {
@@ -26,7 +28,7 @@ module.exports = {
             Assets.map(asset => {
                 return {
                     from: path.resolve(__dirname, `./node_modules/${asset}`),
-                    to: path.resolve(__dirname, './dist/libraries')
+                    to: path.resolve(__dirname, "./dist/libraries")
                 };
             })
         )