diff --git a/config-overrides.js b/config-overrides.js
index 73784dc..d78d7f7 100644
--- a/config-overrides.js
+++ b/config-overrides.js
@@ -3,129 +3,75 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
-// Export override function(s) via object
 module.exports = {
-  webpack: override,
-  // You may also override the Jest config (used for tests) by adding property with 'jest' name below. See react-app-rewired library's docs for details
-};
+  webpack: (config, env) => {
+    const isEnvProduction = env === "production";
+    const minify = isEnvProduction && {
+      removeComments: true,
+      collapseWhitespace: true,
+      removeRedundantAttributes: true,
+      useShortDoctype: true,
+      removeEmptyAttributes: true,
+      removeStyleLinkTypeAttributes: true,
+      keepClosingSlash: true,
+      minifyJS: true,
+      minifyCSS: true,
+      minifyURLs: true,
+    };
+    const names = [
+      "HtmlWebpackPlugin",
+      "WebpackManifestPlugin",
+      "MiniCssExtractPlugin",
+    ];
 
-// Function to override the CRA webpack config
-function override(config, env) {
-  // Replace single entry point in the config with multiple ones
-  // Note: you may remove any property below except "popup" to exclude respective entry point from compilation
-  config.entry = {
-    popup: paths.appIndexJs,
-    options: paths.appSrc + "/options.js",
-    background: paths.appSrc + "/background.js",
-    content: paths.appSrc + "/content.js",
-  };
-  // Change output filename template to get rid of hash there
-  config.output.filename = "[name].js";
-  config.output.assetModuleFilename = "media/[name][ext]";
-  // Disable built-in SplitChunksPlugin
-  config.optimization.splitChunks = {
-    cacheGroups: { default: false },
-  };
-  // Disable runtime chunk addition for each entry point
-  config.optimization.runtimeChunk = false;
+    config.entry = {
+      popup: paths.appIndexJs,
+      options: paths.appSrc + "/options.js",
+      background: paths.appSrc + "/background.js",
+      content: paths.appSrc + "/content.js",
+    };
 
-  // Shared minify options to be used in HtmlWebpackPlugin constructor
-  const minifyOpts = {
-    removeComments: true,
-    collapseWhitespace: true,
-    removeRedundantAttributes: true,
-    useShortDoctype: true,
-    removeEmptyAttributes: true,
-    removeStyleLinkTypeAttributes: true,
-    keepClosingSlash: true,
-    minifyJS: true,
-    minifyCSS: true,
-    minifyURLs: true,
-  };
-  const isEnvProduction = env === "production";
+    config.output.filename = "[name].js";
+    config.output.assetModuleFilename = "media/[name][ext]";
+    config.optimization.splitChunks = {
+      cacheGroups: { default: false },
+    };
+    config.optimization.runtimeChunk = false;
 
-  // Custom HtmlWebpackPlugin instance for index (popup) page
-  const indexHtmlPlugin = new HtmlWebpackPlugin({
-    inject: true,
-    chunks: ["popup"],
-    template: paths.appHtml,
-    filename: "popup.html",
-    minify: isEnvProduction && minifyOpts,
-  });
-  // Replace origin HtmlWebpackPlugin instance in config.plugins with the above one
-  config.plugins = replacePlugin(
-    config.plugins,
-    (name) => /HtmlWebpackPlugin/i.test(name),
-    indexHtmlPlugin
-  );
-
-  // Extra HtmlWebpackPlugin instance for options page
-  const optionsHtmlPlugin = new HtmlWebpackPlugin({
-    inject: true,
-    chunks: ["options"],
-    template: paths.appHtml,
-    filename: "options.html",
-    minify: isEnvProduction && minifyOpts,
-  });
-  // Add the above HtmlWebpackPlugin instance into config.plugins
-  // Note: you may remove/comment the next line if you don't need an options page
-  config.plugins.push(optionsHtmlPlugin);
-
-  // Extra HtmlWebpackPlugin instance for options page
-  const contentHtmlPlugin = new HtmlWebpackPlugin({
-    inject: true,
-    chunks: ["content"],
-    template: paths.appPublic + "/content.html",
-    filename: "content.html",
-    minify: isEnvProduction && minifyOpts,
-  });
-  // Add the above HtmlWebpackPlugin instance into config.plugins
-  // Note: you may remove/comment the next line if you don't need an options page
-  config.plugins.push(contentHtmlPlugin);
-
-  // Custom ManifestPlugin instance to cast asset-manifest.json back to old plain format
-  const manifestPlugin = new WebpackManifestPlugin({
-    fileName: "asset-manifest.json",
-  });
-  // Replace origin ManifestPlugin instance in config.plugins with the above one
-  config.plugins = replacePlugin(
-    config.plugins,
-    (name) => /ManifestPlugin/i.test(name),
-    manifestPlugin
-  );
-
-  // Custom MiniCssExtractPlugin instance to get rid of hash in filename template
-  const miniCssExtractPlugin = new MiniCssExtractPlugin({
-    filename: "css/[name].css",
-  });
-  // Replace origin MiniCssExtractPlugin instance in config.plugins with the above one
-  config.plugins = replacePlugin(
-    config.plugins,
-    (name) => /MiniCssExtractPlugin/i.test(name),
-    miniCssExtractPlugin
-  );
-
-  // Remove GenerateSW plugin from config.plugins to disable service worker generation
-  config.plugins = replacePlugin(config.plugins, (name) =>
-    /GenerateSW/i.test(name)
-  );
-
-  return config;
-}
-
-// Utility function to replace/remove specific plugin in a webpack config
-function replacePlugin(plugins, nameMatcher, newPlugin) {
-  const i = plugins.findIndex((plugin) => {
-    return (
-      plugin.constructor &&
-      plugin.constructor.name &&
-      nameMatcher(plugin.constructor.name)
+    config.plugins = config.plugins.filter(
+      (plugin) => !names.find((name) => name.match(plugin.constructor.name))
     );
-  });
-  return i > -1
-    ? plugins
-        .slice(0, i)
-        .concat(newPlugin || [])
-        .concat(plugins.slice(i + 1))
-    : plugins;
-}
+
+    config.plugins.push(
+      new HtmlWebpackPlugin({
+        inject: true,
+        chunks: ["options"],
+        template: paths.appHtml,
+        filename: "options.html",
+        minify,
+      }),
+      new HtmlWebpackPlugin({
+        inject: true,
+        chunks: ["content"],
+        template: paths.appPublic + "/content.html",
+        filename: "content.html",
+        minify,
+      }),
+      new HtmlWebpackPlugin({
+        inject: true,
+        chunks: ["popup"],
+        template: paths.appHtml,
+        filename: "popup.html",
+        minify,
+      }),
+      new WebpackManifestPlugin({
+        fileName: "asset-manifest.json",
+      }),
+      new MiniCssExtractPlugin({
+        filename: "css/[name].css",
+      })
+    );
+
+    return config;
+  },
+};