diff --git a/src/Squidex/app-config/webpack.run.prod.js b/src/Squidex/app-config/webpack.run.prod.js
index d5f989ab5..55677f21e 100644
--- a/src/Squidex/app-config/webpack.run.prod.js
+++ b/src/Squidex/app-config/webpack.run.prod.js
@@ -1,6 +1,7 @@
       var webpack = require('webpack'),
      webpackMerge = require('webpack-merge'),
 ExtractTextPlugin = require('extract-text-webpack-plugin'),
+   UglifyJsPlugin = require('uglifyjs-webpack-plugin'),
    ngToolsWebpack = require('@ngtools/webpack'),
         runConfig = require('./webpack.run.base.js'),
           helpers = require('./helpers');
@@ -86,6 +87,7 @@ module.exports = webpackMerge(runConfig, {
     plugins: [
         new webpack.NoEmitOnErrorsPlugin(),
         new webpack.DefinePlugin({ 'process.env': { 'ENV': JSON.stringify(ENV) } }),
+        new webpack.optimize.ModuleConcatenationPlugin(),
 
         /*
          * Puts each bundle into a file and appends the hash of the file to the path.
@@ -93,16 +95,20 @@ module.exports = webpackMerge(runConfig, {
          * See: https://github.com/webpack/extract-text-webpack-plugin
          */
         new ExtractTextPlugin('[name].css'),
-
-        new webpack.optimize.UglifyJsPlugin({
-            beautify: false,
-            mangle: {
-                screw_ie8: true, keep_fnames: true
-            },
-            compress: {
-                screw_ie8: true, warnings: false
-            },
-            comments: false
+        
+        new UglifyJsPlugin({
+            cache: true,
+            uglifyOptions: {
+                mangle: {
+                    safari10: true,
+                },
+                compress: {
+                    pure_getters: true, passes: 3
+                },
+                output: {
+                    ascii_only: true, comments: false,webkit: true,
+                }
+            }
         }),
 
         new ngToolsWebpack.AngularCompilerPlugin({
diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
index f1563c37b..afdde04bc 100644
--- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
+++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
@@ -9,7 +9,8 @@
 
 .graphiql-container > * {
     box-sizing: content-box;
-    
+
+    // sass-lint:disable class-name-format
     & .editorWrap {
         overflow: hidden;
     }
diff --git a/src/Squidex/app/theme/_rules.scss b/src/Squidex/app/theme/_rules.scss
index c9cf20d62..053604955 100644
--- a/src/Squidex/app/theme/_rules.scss
+++ b/src/Squidex/app/theme/_rules.scss
@@ -10,6 +10,8 @@ $action-slack:            #5c3a58;
 $action-azure:            #55b3ff;
 $action-fastly:           #e23335;
 
+// sass-lint:disable class-name-format
+
 @mixin build-element($color) {
     & {
         background: $color;
diff --git a/src/Squidex/package.json b/src/Squidex/package.json
index a2bade1fd..98266ec18 100644
--- a/src/Squidex/package.json
+++ b/src/Squidex/package.json
@@ -9,7 +9,7 @@
     "test:coverage": "karma start karma.coverage.conf.js",
     "test:clean": "rimraf _test-output",
     "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
-    "build": "webpack --config app-config/webpack.run.prod.js --display-error-details --bail",
+    "build": "webpack --config app-config/webpack.run.prod.js --display-error-details --bail --display-optimization-bailout",
     "build:nobail": "webpack --config app-config/webpack.run.prod.js --display-error-details",
     "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/",
     "build:clean": "rimraf wwwroot/build"
@@ -63,7 +63,7 @@
     "file-loader": "1.1.6",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "2.30.1",
-    "ignore-loader": "^0.1.2",
+    "ignore-loader": "0.1.2",
     "istanbul-instrumenter-loader": "0.2.0",
     "jasmine-core": "2.9.1",
     "karma": "2.0.0",
@@ -72,7 +72,7 @@
     "karma-coverage": "1.1.1",
     "karma-htmlfile-reporter": "0.3.5",
     "karma-jasmine": "1.1.1",
-    "karma-jasmine-html-reporter": "^0.2.2",
+    "karma-jasmine-html-reporter": "0.2.2",
     "karma-mocha-reporter": "2.2.5",
     "karma-phantomjs-launcher": "1.0.4",
     "karma-sourcemap-loader": "0.3.7",
@@ -90,6 +90,7 @@
     "tslint-loader": "3.5.3",
     "typemoq": "2.1.0",
     "typescript": "2.5.3",
+    "uglifyjs-webpack-plugin": "1.1.8",
     "underscore": "1.8.3",
     "webpack": "3.10.0",
     "webpack-dev-server": "2.11.1",