diff --git a/frontend/.stylelintrc b/frontend/.stylelintrc
index 5f197acca..5587e5d4d 100644
--- a/frontend/.stylelintrc
+++ b/frontend/.stylelintrc
@@ -24,7 +24,7 @@
         "ignoreAtRules": [
           "/^add\\-mixin$/",
           "/^define\\-mixin$/"
-        ] 
+        ]
       }
     ],
     "at-rule-no-vendor-prefix": true,
diff --git a/frontend/gulp/webpack.js b/frontend/gulp/webpack.js
index c6c5bc2d9..80368d964 100644
--- a/frontend/gulp/webpack.js
+++ b/frontend/gulp/webpack.js
@@ -4,6 +4,7 @@ const livereload = require('gulp-livereload');
 const path = require('path');
 const webpack = require('webpack');
 const errorHandler = require('./helpers/errorHandler');
+const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
@@ -47,6 +48,8 @@ HtmlWebpackPlugin.prototype.injectAssetsIntoHtml = function(html, assets, assetT
 };
 
 const plugins = [
+  new OptimizeCssAssetsPlugin({}),
+
   new webpack.DefinePlugin({
     __DEV__: !isProduction,
     'process.env.NODE_ENV': isProduction ? JSON.stringify('production') : JSON.stringify('development')
@@ -254,7 +257,7 @@ gulp.task('webpack', () => {
 gulp.task('webpackWatch', () => {
   config.watch = true;
 
-  return webpackStream(config)
+  return webpackStream(config, webpack)
     .on('error', errorHandler)
     .pipe(gulp.dest('_output/UI'))
     .on('error', errorHandler)
diff --git a/frontend/src/Settings/Indexers/IndexerSettings.js b/frontend/src/Settings/Indexers/IndexerSettings.js
index 9650b9471..c4076253a 100644
--- a/frontend/src/Settings/Indexers/IndexerSettings.js
+++ b/frontend/src/Settings/Indexers/IndexerSettings.js
@@ -43,8 +43,8 @@ class IndexerSettings extends Component {
     }
   }
 
-  // Render
   //
+  // Render
 
   render() {
     const {
diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js
index 59f74e4a2..a726a7806 100644
--- a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js
+++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js
@@ -51,7 +51,7 @@ class AddIndexerModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>Radarr supports any indexer that uses the Newznab standard, as well as other indexers listed below.</div>
-                  <div>For more information on the individual indexers, clink on the info buttons.</div>
+                  <div>For more information on the individual indexers, click on the info buttons.</div>
                 </Alert>
 
                 <FieldSet legend="Usenet">
diff --git a/frontend/src/Settings/Indexers/Indexers/Indexer.js b/frontend/src/Settings/Indexers/Indexers/Indexer.js
index 8ffbe571d..512f6dea2 100644
--- a/frontend/src/Settings/Indexers/Indexers/Indexer.js
+++ b/frontend/src/Settings/Indexers/Indexers/Indexer.js
@@ -84,7 +84,7 @@ class Indexer extends Component {
 
           <IconButton
             className={styles.cloneButton}
-            title="Clone Profile"
+            title="Clone Indexer"
             name={icons.CLONE}
             onPress={this.onCloneIndexerPress}
           />
diff --git a/frontend/src/Settings/Metadata/MetadataSettings.js b/frontend/src/Settings/Metadata/MetadataSettings.js
index 1e911d08d..c2743265b 100644
--- a/frontend/src/Settings/Metadata/MetadataSettings.js
+++ b/frontend/src/Settings/Metadata/MetadataSettings.js
@@ -38,6 +38,9 @@ class MetadataSettings extends Component {
     }
   }
 
+  //
+  // Render
+  
   render() {
     const {
       isSaving,
diff --git a/package.json b/package.json
index 0c13ea9b4..9bf4579b6 100644
--- a/package.json
+++ b/package.json
@@ -62,12 +62,10 @@
     "gulp": "4.0.2",
     "gulp-cached": "1.1.1",
     "gulp-concat": "2.6.1",
-    "gulp-declare": "0.3.0",
     "gulp-livereload": "4.0.2",
     "gulp-postcss": "8.0.0",
     "gulp-print": "5.0.2",
     "gulp-sourcemaps": "2.6.5",
-    "gulp-stripbom": "1.0.5",
     "gulp-watch": "5.0.1",
     "gulp-wrap": "0.15.0",
     "history": "4.10.1",
@@ -81,6 +79,7 @@
     "moment": "2.24.0",
     "mousetrap": "1.6.5",
     "normalize.css": "8.0.1",
+    "optimize-css-assets-webpack-plugin": "5.0.3",
     "postcss-color-function": "4.1.0",
     "postcss-loader": "3.0.0",
     "postcss-mixins": "6.2.3",