diff --git a/test/e2e-cypress/static/index.html b/test/e2e-cypress/static/index.html
index 4a47a06f..2782d0cf 100644
--- a/test/e2e-cypress/static/index.html
+++ b/test/e2e-cypress/static/index.html
@@ -49,7 +49,7 @@
       plugins: [
         SwaggerUIBundle.plugins.DownloadUrl
       ],
-      layout: "StandaloneLayout",
+      layout: SwaggerUIStandalonePreset ? "StandaloneLayout" : "BaseLayout",
       onComplete: () => {
         if(window.completeCount) {
           window.completeCount++
diff --git a/webpack-dist-bundle.config.js b/webpack-dist-bundle.config.js
index 5872c1ed..6ff85ca5 100644
--- a/webpack-dist-bundle.config.js
+++ b/webpack-dist-bundle.config.js
@@ -1,5 +1,5 @@
 const path = require("path")
-const styleRules = require("./webpack.dist-style.config.js")
+const styleRules = require("./webpack-dist-style.config.js")
 
 let rules = [
   { test: /\.(worker\.js)(\?.*)?$/,
diff --git a/webpack-dist-standalone.config.js b/webpack-dist-standalone.config.js
index 3f16b5dd..6f5c4ac0 100644
--- a/webpack-dist-standalone.config.js
+++ b/webpack-dist-standalone.config.js
@@ -1,5 +1,5 @@
 const path = require("path")
-const styleRules = require("./webpack.dist-style.config.js")
+const styleRules = require("./webpack-dist-style.config.js")
 
 let rules = [
   { test: /\.(worker\.js)(\?.*)?$/,
diff --git a/webpack.dist-style.config.js b/webpack-dist-style.config.js
similarity index 100%
rename from webpack.dist-style.config.js
rename to webpack-dist-style.config.js
diff --git a/webpack-dist.config.js b/webpack-dist.config.js
index 391c4a96..322d0cec 100644
--- a/webpack-dist.config.js
+++ b/webpack-dist.config.js
@@ -1,7 +1,7 @@
 const path = require("path")
 const fs = require("fs")
 const nodeModules = fs.readdirSync("node_modules").filter(function(x) { return x !== ".bin" })
-const styleRules = require("./webpack.dist-style.config.js")
+const styleRules = require("./webpack-dist-style.config.js")
 
 let rules = [
   { test: /\.(worker\.js)(\?.*)?$/,
diff --git a/webpack-hot-dev-server.config.js b/webpack-hot-dev-server.config.js
index 46fcc407..0e1351f4 100644
--- a/webpack-hot-dev-server.config.js
+++ b/webpack-hot-dev-server.config.js
@@ -1,4 +1,4 @@
-const path = require("path")
+const styleRules = require("./webpack-dist-style.config.js")
 
 const rules = [
   { test: /\.(worker\.js)(\?.*)?$/,
@@ -12,44 +12,23 @@ const rules = [
       { loader: "babel-loader?retainLines=true" }
     ]
   },
-  { test: /\.(css)(\?.*)?$/,
-    use: [
-      "style-loader",
-      "css-loader",
-      "postcss-loader"
-    ]
-  },
-  { test: /\.(scss)(\?.*)?$/,
-    use: [
-      "style-loader",
-      "css-loader",
-      {
-        loader: "postcss-loader",
-        options: { sourceMap: true }
-      },
-      { loader: "sass-loader",
-        options: {
-          outputStyle: "expanded",
-          sourceMap: true,
-          sourceMapContents: "true"
-        }
-      }
-    ]
-  }
+  ...styleRules
 ]
 
 module.exports = require("./make-webpack-config")(rules, {
   _special: {
-    separateStylesheets: false,
+    separateStylesheets: true,
     sourcemaps: true,
   },
   entry: {
+    "swagger-ui": [
+      "./src/style/main.scss"
+    ],
     "swagger-ui-bundle": [
       "./src/polyfills",
       "./src/core/index.js"
     ],
     "swagger-ui-standalone-preset": [
-      "./src/style/main.scss",
       "./src/polyfills",
       "./src/standalone/index.js",
     ]