diff --git a/src/IndexHTML.jsx b/src/IndexHTML.jsx
index 08a92a6..46518ed 100644
--- a/src/IndexHTML.jsx
+++ b/src/IndexHTML.jsx
@@ -93,10 +93,11 @@ export default class IndexHTML extends React.Component {
           <meta content="oice" name="apple-mobile-web-app-title" />
 
           <title>{meta.title}</title>
-          <link rel="preload" href={`/build/manifest.js?v=${VERSION}`} as="script" />
+          <link rel="preload" href={`/build/vendor.css?v=${VERSION}`} as="style" />
+          <link rel="preload" href={`/build/common.css?v=${VERSION}`} as="style" />
+          <link rel="preload" href={`/build/${module}.css?v=${VERSION}`} as="style" />
           <link rel="preload" href={`/build/vendor.js?v=${VERSION}`} as="script" />
           <link rel="preload" href={`/build/common.js?v=${VERSION}`} as="script" />
-          <link rel="preload" href={`/build/${module}.css?v=${VERSION}`} as="style" />
           {modules.map(m => (
             <link
               key={m}
@@ -106,13 +107,13 @@ export default class IndexHTML extends React.Component {
             />
           ))}
 
-          {!DEBUG &&
+          {!DEBUG && ['vendor', 'common', module].map(m => (
             <link
-              href={`/build/${module}.css?v=${VERSION}`}
+              href={`/build/${m}.css?v=${VERSION}`}
               rel="stylesheet"
               type="text/css"
             />
-          }
+          ))}
           <link
             href="/img/favicon.ico"
             rel="shortcut icon"
@@ -144,10 +145,6 @@ export default class IndexHTML extends React.Component {
           <div id="app" className={className}>
             {children}
           </div>
-          <script
-            src={`/build/manifest.js?v=${VERSION}`}
-            type="application/javascript"
-          />
           <script
             src={`/build/vendor.js?v=${VERSION}`}
             type="application/javascript"
diff --git a/webpack.config.js b/webpack.config.js
index e5c245f..6b5bfe3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -64,6 +64,24 @@ module.exports = {
     path: BUILD_DIR,
     publicPath: `/${BUILD_DIR_NAME}/`,
   },
+  optimization: {
+    minimize: !DEBUG,
+    splitChunks: {
+      cacheGroups: {
+        vendor: {
+          test: /[\\/]node_modules[\\/]/,
+          name: 'vendor',
+          chunks: 'all',
+        },
+        common: {
+          chunks: 'all',
+          name: 'common',
+          minChunks: 2,
+        },
+      },
+    },
+    runtimeChunk: false,
+  },
   performance: {
     maxEntrypointSize: 1000000,
     maxAssetSize: 300000,
@@ -157,8 +175,6 @@ module.exports = {
     new webpack.HotModuleReplacementPlugin(),
   ] : [
     // Production
-    new webpack.HashedModuleIdsPlugin(),
     new webpack.DefinePlugin({ 'global.GENTLY': false }),
-    new webpack.optimize.ModuleConcatenationPlugin(),
   ]),
 };