diff --git a/package.json b/package.json
index 924df52d6..29becde3e 100644
--- a/package.json
+++ b/package.json
@@ -213,6 +213,7 @@
     "enzyme-adapter-react-15": "^1.0.0",
     "eslint": "^4.5.0",
     "eslint-plugin-mocha": "^4.11.0",
+    "extract-text-webpack-plugin": "^3.0.2",
     "husky": "^0.14.3",
     "identity-obj-proxy": "^3.0.0",
     "ip": "^1.1.5",
diff --git a/views/admin.ejs b/views/admin.ejs
index 939da0dcf..36356f797 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -5,6 +5,7 @@
     <title>Talk - Coral Admin</title>
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
     <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.min.css">
+    <link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/coral-admin/bundle.css">
     <style media="screen">
       body, #root {
         width: 100%;
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs
index f9af61f7c..062dc582a 100644
--- a/views/embed/stream.ejs
+++ b/views/embed/stream.ejs
@@ -3,6 +3,7 @@
   <head>
     <meta name="viewport" content="width=device-width, user-scalable=no">
     <link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/embed/stream/default.css">
+    <link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/embed/stream/bundle.css">
     <%- include ../partials/head %>
   </head>
   <body class="embed-stream-page">
diff --git a/views/login.ejs b/views/login.ejs
index 87c5929f6..50c90db3c 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta name="viewport" content="width=device-width, user-scalable=no">
+    <link rel="stylesheet" type="text/css" href="<%= STATIC_URL %>static/coral-login/bundle.css">
     <%- include partials/head %>
   </head>
   <body>
diff --git a/webpack.config.js b/webpack.config.js
index 647b9c320..5254d0954 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,6 +10,7 @@ const webpack = require('webpack');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
 const debug = require('debug')('talk:webpack');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 // Possibly load the config from the .env file (if there is one).
 require('dotenv').config();
@@ -85,11 +86,13 @@ const config = {
         test: /\.yml$/,
       },
       {
-        loaders: [
-          'style-loader',
-          'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
-          'postcss-loader',
-        ],
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader',
+          use: [
+            'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
+            'postcss-loader',
+          ],
+        }),
         test: /.css$/,
       },
       {
@@ -108,6 +111,9 @@ const config = {
     ],
   },
   plugins: [
+    new ExtractTextPlugin({
+      filename: getPath => getPath('[name].css'),
+    }),
     new Copy([
       ...buildEmbeds.map(embed => ({
         from: path.join(__dirname, 'client', `coral-embed-${embed}`, 'style'),
diff --git a/yarn.lock b/yarn.lock
index 135719b51..9fe038a58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -598,7 +598,7 @@ async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2, async@^2.1.4, async@~2.6.0:
+async@^2.1.2, async@^2.1.4, async@^2.4.1, async@~2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -3630,6 +3630,15 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-text-webpack-plugin@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
+  dependencies:
+    async "^2.4.1"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
