diff --git a/package.json b/package.json
index 80f222ae..a9935e34 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
   },
   "license": "GPL-3.0",
   "devDependencies": {
+    "@types/core-js": "^0.9.32",
     "copy-webpack-plugin": "^3.0.1",
     "gulp": "^3.9.1",
     "gulp-if": "^2.0.1",
@@ -35,18 +36,16 @@
     "@angular/platform-browser": "2.0.0-rc.6",
     "@angular/platform-browser-dynamic": "2.0.0-rc.6",
     "@angular/router": "3.0.0-rc.2",
-    "@types/es6-shim": "0.0.31",
     "@types/jquery": "1.10.31",
     "@types/node": "6.0.38",
     "bootstrap": "^3.3.7",
     "browser-stdout": "^1.3.0",
-    "es6-shim": "^0.35.1",
+    "core-js": "2.4.1",
     "font-awesome": "^4.6.3",
     "handlebars": "^4.0.5",
     "jquery": "^2.2.2",
     "json-loader": "^0.5.4",
     "ng2-select2": "0.4.2",
-    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.11",
     "select2": "^4.0.3",
     "sortablejs": "^1.4.2",
diff --git a/src/tsconfig.json b/src/tsconfig.json
index f9dd8f1c..25aecfb2 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -15,7 +15,7 @@
     "types": [
       "node",
       "jquery",
-      "es6-shim",
+      "core-js",
       "select2"
     ]
   },
diff --git a/src/webpack.config.js b/src/webpack.config.js
index b82f31cd..53130575 100644
--- a/src/webpack.config.js
+++ b/src/webpack.config.js
@@ -7,7 +7,7 @@ var path = require('path');
 var rootDir = path.resolve(__dirname, '../');
 
 module.exports = {
-    entry: ['es6-shim', 'zone.js', 'reflect-metadata', './src/boot.ts'],
+    entry: ['core-js', 'zone.js', './src/boot.ts'],
     output: {
         path: rootDir + "/dist",
         filename: "uhk.js"