diff --git a/.gitignore b/.gitignore
index 98db37c172..f104fcdb43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ lerna-debug.log*
 .vscode
 
 # App packaged
+redisinsight/electron/preload.js
 release
 main.prod.js
 main.prod.js.map
@@ -56,6 +57,9 @@ dll
 main.js
 main.js.map
 vendor
+redisinsight/main.js.LICENSE.txt
+redisinsight/main.prod.js.LICENSE.txt
+
 
 # E2E tests report
 /tests/e2e/report
diff --git a/configs/paths.js b/configs/paths.js
deleted file mode 100644
index 2a08f20afa..0000000000
--- a/configs/paths.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// paths.js
-
-// Paths will export some path variables that we'll
-// use in other Webpack config and server files
-
-const path = require('path');
-const fs = require('fs');
-
-const appDirectory = fs.realpathSync(process.cwd());
-const resolveApp = (relativePath) => path.resolve(appDirectory, relativePath);
-
-module.exports = {
-  appAssets: resolveApp('ui/src/assets'), // For images and other assets
-  appBuild: resolveApp('ui/dist'), // Prod built files end up here
-  appConfig: resolveApp('ui/config'), // App config files
-  appSrc: resolveApp('ui/src'), // App source
-};
diff --git a/configs/webpack.config.base.js b/configs/webpack.config.base.ts
similarity index 71%
rename from configs/webpack.config.base.js
rename to configs/webpack.config.base.ts
index a58581b672..a9f5779a29 100644
--- a/configs/webpack.config.base.js
+++ b/configs/webpack.config.base.ts
@@ -1,11 +1,13 @@
-import path from 'path';
 import webpack from 'webpack';
-import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
+import TsconfigPathsPlugins from 'tsconfig-paths-webpack-plugin';
+import webpackPaths from './webpack.paths';
 import { dependencies as externals } from '../redisinsight/package.json';
 
-export default {
+const configuration: webpack.Configuration =  {
   externals: [...Object.keys(externals || {})],
 
+  stats: 'errors-only',
+
   module: {
     rules: [
       {
@@ -22,28 +24,27 @@ export default {
   },
 
   output: {
-    path: path.join(__dirname, '..'),
-    // commonjs2 https://github.com/webpack/webpack/issues/1114
-    libraryTarget: 'commonjs2',
+    path: webpackPaths.riPath,
+    // https://github.com/webpack/webpack/issues/1114
+    library: {
+      type: 'commonjs2',
+    },
   },
 
   resolve: {
     extensions: ['.js', '.jsx', '.json', '.ts', '.tsx', '.scss'],
-    plugins: [
-      new TsconfigPathsPlugin({
-        configFile: path.join(__dirname, '..', 'tsconfig.json'),
-      }),
-    ],
+    modules: [webpackPaths.apiPath, 'node_modules'],
+    plugins: [new TsconfigPathsPlugins()],
     alias: {
-      src: path.resolve(__dirname, '../redisinsight/api/src'),
-      apiSrc: path.resolve(__dirname, '../redisinsight/api/src'),
-      uiSrc: path.resolve(__dirname, '../redisinsight/ui/src'),
+      src: webpackPaths.apiSrcPath,
+      apiSrc: webpackPaths.apiSrcPath,
+      uiSrc: webpackPaths.uiSrcPath,
     },
-    modules: [path.join(__dirname, '../redisinsight/api'), 'node_modules'],
   },
 
   plugins: [
     new webpack.EnvironmentPlugin({
+      NODE_ENV: 'production',
     }),
 
     new webpack.IgnorePlugin({
@@ -81,3 +82,5 @@ export default {
     }),
   ],
 };
+
+export default configuration;
diff --git a/configs/webpack.config.eslint.js b/configs/webpack.config.eslint.js
index b1cf088a40..d7dac976b0 100644
--- a/configs/webpack.config.eslint.js
+++ b/configs/webpack.config.eslint.js
@@ -2,4 +2,4 @@
 /* eslint import/no-unresolved: off, import/no-self-import: off */
 require('@babel/register');
 
-module.exports = require('./webpack.config.renderer.dev.babel').default;
+module.exports = require('./webpack.config.renderer.dev').default;
diff --git a/configs/webpack.config.main.prod.babel.js b/configs/webpack.config.main.prod.ts
similarity index 78%
rename from configs/webpack.config.main.prod.babel.js
rename to configs/webpack.config.main.prod.ts
index 2a4857c0c7..bf7d0be134 100644
--- a/configs/webpack.config.main.prod.babel.js
+++ b/configs/webpack.config.main.prod.ts
@@ -1,11 +1,11 @@
 import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import { toString } from 'lodash'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import baseConfig from './webpack.config.base';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
 import { version } from '../redisinsight/package.json';
+import webpackPaths from './webpack.paths';
 
 DeleteSourceMaps();
 
@@ -23,19 +23,25 @@ export default merge(baseConfig, {
 
   target: 'electron-main',
 
-  entry: './redisinsight/main.dev.ts',
+  entry: {
+    main: path.join(webpackPaths.electronPath, 'main.dev.ts'),
+    preload: path.join(webpackPaths.electronPath, 'preload.ts'),
+  },
 
   resolve: {
     alias: {
-      ['apiSrc']: path.resolve(__dirname, '../redisinsight/api/src'),
-      ['src']: path.resolve(__dirname, '../redisinsight/api/src'),
+      ['apiSrc']: webpackPaths.apiSrcPath,
+      ['src']: webpackPaths.apiSrcPath,
     },
     extensions: ['.tsx', '.ts', '.js', '.jsx'],
   },
 
   output: {
-    path: path.join(__dirname, '../redisinsight'),
-    filename: 'main.prod.js',
+    path: webpackPaths.distMainPath,
+    filename: '[name].js',
+    library: {
+      type: 'umd',
+    },
   },
 
   // optimization: {
@@ -46,10 +52,6 @@ export default merge(baseConfig, {
   //   ],
   // },
 
-  // alias: {
-  //   'apiSrc': path.resolve(__dirname, '../redisinsight/api/src/')
-  // },
-
   plugins: [
     new BundleAnalyzerPlugin({
       analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
@@ -71,9 +73,10 @@ export default merge(baseConfig, {
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
       SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
-        : toString(30 * 1000), // 30 sec
+    }),
+
+    new webpack.DefinePlugin({
+      'process.type': '"browser"',
     }),
   ],
 
diff --git a/configs/webpack.config.main.stage.babel.js b/configs/webpack.config.main.stage.ts
similarity index 81%
rename from configs/webpack.config.main.stage.babel.js
rename to configs/webpack.config.main.stage.ts
index 42956ea34a..88654a7cb3 100644
--- a/configs/webpack.config.main.stage.babel.js
+++ b/configs/webpack.config.main.stage.ts
@@ -1,8 +1,7 @@
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import { toString } from 'lodash'
-import mainProdConfig from './webpack.config.main.prod.babel';
+import mainProdConfig from './webpack.config.main.prod';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
 import { version } from '../redisinsight/package.json';
 
@@ -31,9 +30,6 @@ export default merge(mainProdConfig, {
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
       SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
-        : toString(30 * 1000), // 30 sec
     }),
   ],
 });
diff --git a/configs/webpack.config.preload.dev.ts b/configs/webpack.config.preload.dev.ts
new file mode 100644
index 0000000000..bccb43c805
--- /dev/null
+++ b/configs/webpack.config.preload.dev.ts
@@ -0,0 +1,64 @@
+import path from 'path';
+import webpack from 'webpack';
+import { merge } from 'webpack-merge';
+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import baseConfig from './webpack.config.base';
+import webpackPaths from './webpack.paths';
+
+const configuration: webpack.Configuration = {
+  devtool: 'inline-source-map',
+
+  mode: 'development',
+
+  target: 'electron-preload',
+
+  entry: path.join(webpackPaths.electronPath, 'preload.ts'),
+
+  output: {
+    path: webpackPaths.dllPath,
+    filename: 'preload.js',
+    library: {
+      type: 'umd',
+    },
+  },
+
+  plugins: [
+    new BundleAnalyzerPlugin({
+      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
+    }),
+
+    /**
+     * Create global constants which can be configured at compile time.
+     *
+     * Useful for allowing different behaviour between development builds and
+     * release builds
+     *
+     * NODE_ENV should be production so that modules do not perform certain
+     * development checks
+     *
+     * By default, use 'development' as NODE_ENV. This can be overriden with
+     * 'staging', for example, by changing the ENV variables in the npm scripts
+     */
+    new webpack.EnvironmentPlugin({
+      NODE_ENV: 'development',
+    }),
+
+    new webpack.LoaderOptionsPlugin({
+      debug: true,
+    }),
+  ],
+
+  /**
+   * Disables webpack processing of __dirname and __filename.
+   * If you run the bundle in node.js it falls back to these values of node.js.
+   * https://github.com/webpack/webpack/issues/2010
+   */
+  node: {
+    __dirname: false,
+    __filename: false,
+  },
+
+  watch: true,
+};
+
+export default merge(baseConfig, configuration);
diff --git a/configs/webpack.config.renderer.dev.dll.babel.js b/configs/webpack.config.renderer.dev.dll.ts
similarity index 55%
rename from configs/webpack.config.renderer.dev.dll.babel.js
rename to configs/webpack.config.renderer.dev.dll.ts
index 2518a6f4e2..a0f419fc0a 100644
--- a/configs/webpack.config.renderer.dev.dll.babel.js
+++ b/configs/webpack.config.renderer.dev.dll.ts
@@ -1,17 +1,17 @@
 import webpack from 'webpack';
 import path from 'path';
 import { merge } from 'webpack-merge';
-import { toString } from 'lodash'
 import baseConfig from './webpack.config.base';
+import webpackPaths from './webpack.paths';
 import { dependencies } from '../package.json';
 import { dependencies as dependenciesApi } from '../redisinsight/package.json';
 
 console.log('dependenciesApi', dependenciesApi);
 
-const dist = path.join(__dirname, '../dll');
+const dist = webpackPaths.dllPath;
 
 export default merge(baseConfig, {
-  context: path.join(__dirname, '..'),
+  context: webpackPaths.rootPath,
 
   devtool: 'eval',
 
@@ -24,17 +24,19 @@ export default merge(baseConfig, {
   /**
    * Use `module` from `webpack.config.renderer.dev.js`
    */
-  module: require('./webpack.config.renderer.dev.babel').default.module,
+  module: require('./webpack.config.renderer.dev').default.module,
 
   entry: {
     renderer: [...Object.keys(dependencies || {}), ...Object.keys(dependenciesApi || {})],
   },
 
   output: {
-    library: 'renderer',
     path: dist,
     filename: '[name].dev.dll.js',
-    libraryTarget: 'var',
+    library: {
+      name: 'renderer',
+      type: 'var',
+    },
   },
 
   stats: 'errors-only',
@@ -47,29 +49,16 @@ export default merge(baseConfig, {
 
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'development',
-      APP_ENV: 'electron',
-      API_PREFIX: 'api',
-      BASE_API_URL: 'http://localhost',
-      RESOURCES_BASE_URL: 'http://localhost',
-      SCAN_COUNT_DEFAULT: '500',
-      SCAN_TREE_COUNT_DEFAULT: '10000',
-      PIPELINE_COUNT_DEFAULT: '5',
-      SEGMENT_WRITE_KEY:
-      'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
-        : toString(30 * 1000), // 30 sec
     }),
 
     new webpack.LoaderOptionsPlugin({
       debug: true,
       options: {
-        context: path.join(__dirname, '..'),
+        context: webpackPaths.electronPath,
         output: {
-          path: path.join(__dirname, '../dll'),
+          path: webpackPaths.dllPath,
         },
       },
     }),
-
   ],
 });
diff --git a/configs/webpack.config.renderer.dev.babel.js b/configs/webpack.config.renderer.dev.ts
similarity index 55%
rename from configs/webpack.config.renderer.dev.babel.js
rename to configs/webpack.config.renderer.dev.ts
index 19726262dd..95321071f9 100644
--- a/configs/webpack.config.renderer.dev.babel.js
+++ b/configs/webpack.config.renderer.dev.ts
@@ -1,45 +1,69 @@
+import 'webpack-dev-server';
 import path from 'path';
+import { execSync, spawn } from 'child_process';
+import fs from 'fs';
+import chalk from 'chalk';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import { spawn } from 'child_process';
-import { toString } from 'lodash'
 import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
 import baseConfig from './webpack.config.base';
+import webpackPaths from './webpack.paths';
 import { version } from '../redisinsight/package.json';
 
 const port = process.env.PORT || 1212;
-const publicPath = `http://localhost:${port}/dist`;
-const dllDir = path.join(__dirname, '../dll');
-const manifest = path.resolve(dllDir, 'renderer.json');
-const requiredByDLLConfig = module.parent.filename.includes('webpack.config.renderer.dev.dll');
+const manifest = path.resolve(webpackPaths.dllPath, 'renderer.json');
+const skipDLLs =
+  module.parent?.filename.includes('webpack.config.renderer.dev.dll') ||
+  module.parent?.filename.includes('webpack.config.eslint');
+
+/**
+ * Warn if the DLL is not built
+ */
+if (
+  !skipDLLs &&
+  !(fs.existsSync(webpackPaths.dllPath) && fs.existsSync(manifest))
+) {
+  console.log(
+    chalk.black.bgYellow.bold(
+      'The DLL files are missing. Sit back while we build them for you with "npm run build-dll"'
+    )
+  );
+  execSync('npm run postinstall');
+}
 
 function employCache(loaders) {
   return ['cache-loader'].concat(loaders);
 }
 
-export default merge(baseConfig, {
-  devtool: 'inline-source-map',
+const configuration: webpack.Configuration = {
+  devtool: 'source-map',
 
   mode: 'development',
 
-  target: 'electron-renderer',
+  target: ['web', 'electron-renderer'],
 
   entry: [
-    'core-js',
-    'regenerator-runtime/runtime',
-    // require.resolve('../redisinsight/main.renderer.ts'),
-    require.resolve('../redisinsight/ui/indexElectron.tsx'),
+    `webpack-dev-server/client?http://localhost:${port}/dist`,
+    'webpack/hot/only-dev-server',
+    path.join(webpackPaths.uiPath, 'indexElectron.tsx'),
   ],
 
   output: {
-    publicPath: `http://localhost:${port}/dist/`,
+    path: webpackPaths.electronPath,
+    publicPath: '/',
     filename: 'renderer.dev.js',
+    library: {
+      type: 'umd',
+    },
   },
 
   resolve: {
     alias: {
-      apiSrc: path.resolve(__dirname, '../redisinsight/api/src'),
+      src: webpackPaths.apiSrcPath,
+      apiSrc: webpackPaths.apiSrcPath,
+      uiSrc: webpackPaths.uiSrcPath,
     },
   },
 
@@ -193,32 +217,20 @@ export default merge(baseConfig, {
     ],
   },
   plugins: [
-    requiredByDLLConfig
-      ? null
-      : new webpack.DllReferencePlugin({
-          context: path.join(__dirname, '../dll'),
-          manifest: require(manifest),
-          sourceType: 'var',
-        }),
+    ...(skipDLLs
+      ? []
+      : [
+          new webpack.DllReferencePlugin({
+            context: webpackPaths.dllPath,
+            manifest: require(manifest),
+            sourceType: 'var',
+          }),
+        ]),
 
     new webpack.NoEmitOnErrorsPlugin(),
 
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'development',
-      APP_ENV: 'electron',
-      API_PREFIX: 'api',
-      BASE_API_URL: 'http://localhost',
-      RESOURCES_BASE_URL: 'http://localhost',
-      SCAN_COUNT_DEFAULT: '500',
-      SCAN_TREE_COUNT_DEFAULT: '10000',
-      PIPELINE_COUNT_DEFAULT: '5',
-      BUILD_TYPE: 'ELECTRON',
-      APP_VERSION: version,
-      SEGMENT_WRITE_KEY:
-        'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
-        : toString(30 * 1000), // 30 sec
     }),
 
     new webpack.LoaderOptionsPlugin({
@@ -228,6 +240,39 @@ export default merge(baseConfig, {
     new ReactRefreshWebpackPlugin(),
 
     new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
+
+    new HtmlWebpackPlugin({
+      filename: path.join('index.html'),
+      template: path.join(webpackPaths.electronPath, 'index.ejs'),
+      minify: {
+        collapseWhitespace: true,
+        removeAttributeQuotes: true,
+        removeComments: true,
+      },
+      isBrowser: false,
+      env: process.env.NODE_ENV,
+      isDevelopment: process.env.NODE_ENV !== 'production',
+      nodeModules: webpackPaths.appNodeModulesPath,
+    }),
+
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('development'),
+      'process.env.APP_ENV': JSON.stringify('web'),
+      'process.env.API_PREFIX': JSON.stringify('api'),
+      'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
+      'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
+      'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
+      'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
+      'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
+      'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
+      'process.env.APP_VERSION': JSON.stringify(version),
+      'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
+        : JSON.stringify(30 * 1000),
+      'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
+        ? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
+        : JSON.stringify('SOURCE_WRITE_KEY'),
+    }),
   ],
 
   node: {
@@ -237,33 +282,44 @@ export default merge(baseConfig, {
 
   devServer: {
     port,
-    publicPath,
     compress: true,
-    noInfo: false,
-    stats: 'errors-only',
-    inline: true,
-    lazy: false,
     hot: true,
     headers: { 'Access-Control-Allow-Origin': '*' },
-    contentBase: path.join(__dirname, 'dist'),
-    watchOptions: {
-      aggregateTimeout: 300,
-      ignored: /node_modules/,
-      poll: 100,
+    static: {
+      publicPath: '/',
     },
     historyApiFallback: {
       verbose: true,
-      disableDotRule: false,
+      disableDotRule: true,
     },
-    before() {
-      console.log('Starting Main Process...');
-      spawn('npm', ['run', 'start:main'], {
+    setupMiddlewares(middlewares) {
+      console.log('Starting preload.js builder...');
+      const preloadProcess = spawn('npm', ['run', 'start:preload'], {
         shell: true,
-        env: process.env,
         stdio: 'inherit',
       })
         .on('close', (code) => process.exit(code))
         .on('error', (spawnError) => console.error(spawnError));
+
+      console.log('Starting Main Process...');
+      let args = ['run', 'start:main'];
+      if (process.env.MAIN_ARGS) {
+        args = args.concat(
+          ['--', ...process.env.MAIN_ARGS.matchAll(/"[^"]+"|[^\s"]+/g)].flat()
+        );
+      }
+      spawn('npm', args, {
+        shell: true,
+        stdio: 'inherit',
+      })
+        .on('close', (code) => {
+          preloadProcess.kill();
+          process.exit(code);
+        })
+        .on('error', (spawnError) => console.error(spawnError));
+      return middlewares;
     },
   },
-});
+};
+
+export default merge(baseConfig, configuration);
diff --git a/configs/webpack.config.renderer.prod.babel.js b/configs/webpack.config.renderer.prod.ts
similarity index 68%
rename from configs/webpack.config.renderer.prod.babel.js
rename to configs/webpack.config.renderer.prod.ts
index f0c894b9c1..8cd97fc7d3 100644
--- a/configs/webpack.config.renderer.prod.babel.js
+++ b/configs/webpack.config.renderer.prod.ts
@@ -1,14 +1,13 @@
 import path from 'path';
 import webpack from 'webpack';
-import { toString } from 'lodash'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
 import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
 import { merge } from 'webpack-merge';
-import TerserPlugin from 'terser-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
 import baseConfig from './webpack.config.base';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
+import webpackPaths from './webpack.paths';
+import { version } from '../redisinsight/package.json';
 
 DeleteSourceMaps();
 
@@ -19,24 +18,24 @@ const devtoolsConfig =
       }
     : {};
 
-export default merge(baseConfig, {
+const configuration: webpack.Configuration = {
   ...devtoolsConfig,
 
+  devtool: 'source-map',
+
   mode: 'production',
 
-  target: 'electron-renderer',
+  target: ['web', 'electron-renderer'],
 
-  entry: [
-    'core-js',
-    'regenerator-runtime/runtime',
-    // path.join(__dirname, '../redisinsight/main.renderer.ts'),
-    path.join(__dirname, '../redisinsight/ui/indexElectron.tsx'),
-  ],
+  entry: [path.join(webpackPaths.uiPath, 'indexElectron.tsx')],
 
   output: {
-    path: path.join(__dirname, '../redisinsight/dist'),
-    publicPath: './dist/',
-    filename: 'renderer.prod.js',
+    path: webpackPaths.distRendererPath,
+    publicPath: './',
+    filename: 'renderer.js',
+    library: {
+      type: 'umd',
+    },
   },
 
   module: {
@@ -177,43 +176,44 @@ export default merge(baseConfig, {
     ],
   },
 
-  optimization: {
-    minimize: true,
-    minimizer: [
-      new TerserPlugin({
-        parallel: true,
-      }),
-      new CssMinimizerPlugin(),
-    ],
-  },
-
   plugins: [
     new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
 
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'production',
-      DEBUG_PROD: false,
-      API_PREFIX: 'api',
-      BASE_API_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
-      RESOURCES_BASE_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
-      APP_ENV: 'electron',
-      SCAN_COUNT_DEFAULT: '500',
-      SCAN_TREE_COUNT_DEFAULT: '10000',
-      PIPELINE_COUNT_DEFAULT: '5',
-      SEGMENT_WRITE_KEY:
-      'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
-        : toString(30 * 1000), // 30 sec
     }),
 
     new MiniCssExtractPlugin({
       filename: 'style.css',
     }),
 
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
-      openAnalyzer: process.env.OPEN_ANALYZER === 'true',
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: path.join(webpackPaths.electronPath, 'index.ejs'),
+      isBrowser: false,
+      isDevelopment: false,
+    }),
+
+    new webpack.DefinePlugin({
+      'process.type': '"renderer"',
+      'process.env.NODE_ENV': JSON.stringify('development'),
+      'process.env.APP_ENV': JSON.stringify('electron'),
+      'process.env.API_PREFIX': JSON.stringify('api'),
+      'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
+      'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
+      'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
+      'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
+      'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
+      'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
+      'process.env.APP_VERSION': JSON.stringify(version),
+      'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
+        : JSON.stringify(30 * 1000),
+      'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
+        ? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
+        : JSON.stringify('SOURCE_WRITE_KEY'),
     }),
   ],
-});
+};
+
+export default merge(baseConfig, configuration);
diff --git a/configs/webpack.config.renderer.stage.babel.js b/configs/webpack.config.renderer.stage.babel.js
deleted file mode 100644
index b549b4e980..0000000000
--- a/configs/webpack.config.renderer.stage.babel.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
-import { toString } from 'lodash'
-import baseConfig from './webpack.config.base';
-import rendererProdConfig from './webpack.config.renderer.prod.babel';
-import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
-
-DeleteSourceMaps();
-
-export default merge(baseConfig, {
-  ...rendererProdConfig,
-
-  plugins: [
-    ...rendererProdConfig.plugins,
-
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'staging',
-      DEBUG_PROD: false,
-      API_PREFIX: 'api',
-      BASE_API_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
-      RESOURCES_BASE_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
-      APP_ENV: 'electron',
-      SCAN_COUNT_DEFAULT: '500',
-      SCAN_COUNT_MEMORY_ANALYSES: '10000',
-      SEGMENT_WRITE_KEY:
-        'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
-        : toString(30 * 1000), // 30 sec
-    }),
-  ],
-});
diff --git a/configs/webpack.config.renderer.stage.ts b/configs/webpack.config.renderer.stage.ts
new file mode 100644
index 0000000000..30530fc877
--- /dev/null
+++ b/configs/webpack.config.renderer.stage.ts
@@ -0,0 +1,36 @@
+import webpack from 'webpack';
+import { merge } from 'webpack-merge';
+import baseConfig from './webpack.config.base';
+import rendererProdConfig from './webpack.config.renderer.prod';
+import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
+import { version } from '../redisinsight/package.json';
+
+DeleteSourceMaps();
+
+export default merge(baseConfig, {
+  ...rendererProdConfig,
+
+  plugins: [
+    ...rendererProdConfig.plugins,
+
+    new webpack.DefinePlugin({
+      'process.type': '"renderer"',
+      'process.env.NODE_ENV': JSON.stringify('staging'),
+      'process.env.APP_ENV': JSON.stringify('electron'),
+      'process.env.API_PREFIX': JSON.stringify('api'),
+      'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
+      'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
+      'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
+      'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
+      'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
+      'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
+      'process.env.APP_VERSION': JSON.stringify(version),
+      'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
+        : JSON.stringify(30 * 1000),
+      'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
+        ? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
+        : JSON.stringify('SOURCE_WRITE_KEY'),
+    }),
+  ],
+});
diff --git a/configs/webpack.config.web.common.babel.js b/configs/webpack.config.web.common.ts
similarity index 91%
rename from configs/webpack.config.web.common.babel.js
rename to configs/webpack.config.web.common.ts
index 973b9ea30c..295dc0b26e 100644
--- a/configs/webpack.config.web.common.babel.js
+++ b/configs/webpack.config.web.common.ts
@@ -22,12 +22,8 @@ export default {
         include: [path.resolve(__dirname, '../redisinsight/ui')],
         exclude: [
           /node_modules/,
-          path.resolve(__dirname, '../menu.ts'),
-          path.resolve(__dirname, 'menu.ts'),
-          path.resolve(__dirname, '../Menu.ts'),
-          path.resolve(__dirname, 'Menu.ts'),
-          path.resolve(__dirname, '../redisinsight/main.dev.ts'),
           path.resolve(__dirname, '../redisinsight/api'),
+          path.resolve(__dirname, '../redisinsight/electron'),
         ],
         use: {
           loader: 'babel-loader',
@@ -69,6 +65,10 @@ export default {
   },
 
   plugins: [
+    new webpack.DefinePlugin({
+      'window.ENV_VARS.API_PORT': JSON.stringify('5000'),
+    }),
+
     new HtmlWebpackPlugin({ template: 'index.html.ejs' }),
 
     new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),
diff --git a/configs/webpack.config.web.dev.babel.js b/configs/webpack.config.web.dev.ts
similarity index 96%
rename from configs/webpack.config.web.dev.babel.js
rename to configs/webpack.config.web.dev.ts
index 556918c9f8..952a08321b 100644
--- a/configs/webpack.config.web.dev.babel.js
+++ b/configs/webpack.config.web.dev.ts
@@ -10,7 +10,7 @@ import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import ip from 'ip';
 import { toString } from 'lodash'
-import commonConfig from './webpack.config.web.common.babel';
+import commonConfig from './webpack.config.web.common';
 
 function employCache(loaders) {
   return ['cache-loader'].concat(loaders);
@@ -18,7 +18,7 @@ function employCache(loaders) {
 
 const HOST = process.env.PUBLIC_DEV ? ip.address(): 'localhost'
 
-export default merge(commonConfig, {
+const configuration: webpack.Configuration = {
   target: 'web',
 
   mode: 'development',
@@ -176,9 +176,9 @@ export default merge(commonConfig, {
     host: HOST,
     allowedHosts: 'all',
     port: 8080,
-    hot: true, // enable HMR on the server
     historyApiFallback: true,
   },
+
   plugins: [
     new webpack.HotModuleReplacementPlugin({
       multiStep: true,
@@ -202,7 +202,6 @@ export default merge(commonConfig, {
       NODE_ENV: 'development',
       APP_ENV: 'web',
       API_PREFIX: 'api',
-      API_PORT: '5000',
       BASE_API_URL: `http://${HOST}`,
       RESOURCES_BASE_URL: `http://${HOST}`,
       PIPELINE_COUNT_DEFAULT: '5',
@@ -223,6 +222,8 @@ export default merge(commonConfig, {
   ],
 
   externals: {
-    react: 'React',
+    // react: 'React',
   },
-});
+};
+
+export default merge(commonConfig, configuration);
diff --git a/configs/webpack.config.web.prod.babel.js b/configs/webpack.config.web.prod.ts
similarity index 97%
rename from configs/webpack.config.web.prod.babel.js
rename to configs/webpack.config.web.prod.ts
index b3d6101aa5..517e0518bb 100644
--- a/configs/webpack.config.web.prod.babel.js
+++ b/configs/webpack.config.web.prod.ts
@@ -6,7 +6,7 @@ import TerserPlugin from 'terser-webpack-plugin';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import commonConfig from './webpack.config.web.common.babel';
+import commonConfig from './webpack.config.web.common';
 import DeleteDistWeb from '../scripts/DeleteDistWeb';
 
 DeleteDistWeb();
@@ -18,7 +18,7 @@ const devtoolsConfig =
       }
     : {};
 
-export default merge(commonConfig, {
+const configuration: webpack.Configuration = {
   ...devtoolsConfig,
 
   mode: 'production',
@@ -208,4 +208,6 @@ export default merge(commonConfig, {
     ],
   },
   externals: {},
-});
+};
+
+export default merge(commonConfig, configuration);
diff --git a/configs/webpack.paths.ts b/configs/webpack.paths.ts
new file mode 100644
index 0000000000..e4ccb48681
--- /dev/null
+++ b/configs/webpack.paths.ts
@@ -0,0 +1,46 @@
+const path = require('path');
+
+const rootPath = path.join(__dirname, '..');
+
+const riPath = path.join(rootPath, 'redisinsight');
+
+const apiPath = path.join(riPath, 'api');
+const uiPath = path.join(riPath, 'ui');
+const apiSrcPath = path.join(apiPath, 'src');
+const uiSrcPath = path.join(uiPath, 'src');
+const electronPath = path.join(riPath, 'electron');
+const srcMainPath = path.join(electronPath, 'main');
+
+const dllPath = path.join(electronPath, 'dll');
+
+const releasePath = path.join(rootPath, 'release');
+const appPackagePath = path.join(riPath, 'package.json');
+const appNodeModulesPath = path.join(releasePath, 'node_modules');
+const buildAppPackagePath = path.join(releasePath, 'package.json');
+const srcNodeModulesPath = path.join(apiPath, 'node_modules');
+
+const distPath = path.join(riPath, 'dist');
+const distMainPath = path.join(distPath, 'main');
+const distRendererPath = path.join(distPath, 'renderer');
+
+
+export default {
+  rootPath,
+  dllPath,
+  apiPath,
+  uiPath,
+  riPath,
+  apiSrcPath,
+  uiSrcPath,
+  srcMainPath,
+  releasePath,
+  electronPath,
+  appPackagePath,
+  appNodeModulesPath,
+  srcNodeModulesPath,
+  distPath,
+  distMainPath,
+  distRendererPath,
+  buildAppPackagePath,
+  buildPath: releasePath,
+};
diff --git a/electron-builder.json b/electron-builder.json
index b451d01b6e..5b1b54547a 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -3,12 +3,8 @@
   "appId": "org.RedisLabs.RedisInsight-V2",
   "copyright": "Copyright © 2023 Redis Ltd.",
   "files": [
-    "dist/",
-    "node_modules/",
-    "index.html",
-    "splash.html",
-    "main.prod.js",
-    "main.prod.js.map",
+    "dist",
+    "node_modules",
     "package.json"
   ],
   "afterSign": "electron-builder-notarize",
diff --git a/package.json b/package.json
index f2a458f433..97c684bd2e 100644
--- a/package.json
+++ b/package.json
@@ -6,26 +6,26 @@
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=development concurrently \"yarn build:main\" \"yarn build:renderer\"",
-    "build:stage": "cross-env NODE_ENV=staging concurrently \"yarn build:api:stage && yarn build:main:stage\" \"yarn build:renderer:stage\"",
+    "build:stage": "cross-env NODE_ENV=staging TS_NODE_TRANSPILE_ONLY=true concurrently \"yarn build:api:stage && yarn build:main:stage\" \"yarn build:renderer:stage\"",
     "build:prod": "cross-env NODE_ENV=production concurrently \"yarn build:api && yarn build:main\" \"yarn build:renderer\"",
     "build:api": "yarn --cwd redisinsight/api/ build:prod",
     "build:api:stage": "yarn --cwd redisinsight/api/ build:stage",
-    "build:main": "webpack --config ./configs/webpack.config.main.prod.babel.js",
-    "build:main:stage": "webpack --config ./configs/webpack.config.main.stage.babel.js",
-    "build:web": "webpack --config ./configs/webpack.config.web.prod.babel.js",
+    "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.main.prod.ts",
+    "build:main:stage": "cross-env TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.main.stage.ts",
+    "build:web": "cross-env TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.web.prod.ts",
     "build:defaults": "yarn --cwd redisinsight/api build:defaults",
     "build:statics": "yarn build:defaults && sh ./scripts/build-statics.sh",
     "build:statics:win": "yarn build:defaults && ./scripts/build-statics.cmd",
-    "build:renderer": "webpack --config ./configs/webpack.config.renderer.prod.babel.js",
-    "build:renderer:stage": "webpack --config ./configs/webpack.config.renderer.stage.babel.js",
-    "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir redisinsight/ui",
+    "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.renderer.prod.ts",
+    "build:renderer:stage": "cross-env NODE_ENV=staging TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.renderer.stage.ts",
+    "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir redisinsight",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:ui": "eslint ./redisinsight/ui --ext .js,.jsx,.ts,.tsx",
     "lint:api": "yarn --cwd redisinsight/api lint",
     "lint:e2e": "yarn --cwd tests/e2e lint",
     "package": "yarn package:dev",
-    "package:prod": "yarn build:prod && electron-builder build -p never",
-    "package:stage": "yarn build:stage && electron-builder build -p never",
+    "package:prod": "ts-node ./scripts/prebuild.js dist && yarn build:prod && electron-builder build -p never",
+    "package:stage": "ts-node ./scripts/prebuild.js dist && yarn build:stage && electron-builder build -p never",
     "package:mas": "electron-builder build -p never -m mas:universal -c ./electron-builder-mas.js",
     "package:mas:dev": "electron-builder build -p never -m mas-dev:universal -c ./electron-builder-mas.js",
     "package:dev": "yarn build && cross-env DEBUG=electron-builder electron-builder build -p never",
@@ -33,11 +33,13 @@
     "package:mac": "yarn build:prod && electron-builder build --mac -p never",
     "package:mac:arm": "yarn build:prod && electron-builder build --mac --arm64 -p never",
     "package:linux": "yarn build:prod && electron-builder build --linux -p never",
-    "postinstall": "skip-postinstall || (electron-builder install-app-deps && yarn webpack --config ./configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock)",
-    "start": "cross-env NODE_ENV=development webpack serve --config ./configs/webpack.config.renderer.dev.babel.js",
-    "start:main": "cross-env NODE_ENV=development electron -r ./scripts/BabelRegister redisinsight/main.dev.ts",
-    "start:web": "webpack serve --config ./configs/webpack.config.web.dev.babel.js",
-    "start:web:public": "cross-env PUBLIC_DEV=true webpack serve --config ./configs/webpack.config.web.dev.babel.js",
+    "postinstall": "skip-postinstall || (electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall && yarn-deduplicate yarn.lock)",
+    "start": "ts-node ./scripts/check-port-in-use.js && yarn start:renderer",
+    "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.renderer.dev.ts",
+    "start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.preload.dev.ts",
+    "start:main": "cross-env NODE_ENV=development electron -r ./scripts/BabelRegister redisinsight/electron/main.dev.ts",
+    "start:web": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
+    "start:web:public": "cross-env PUBLIC_DEV=true NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
     "test": "jest ./redisinsight/ui -w 1",
     "test:watch": "jest ./redisinsight/ui --watch -w 1",
     "test:cov": "jest ./redisinsight/ui --coverage -w 1",
@@ -137,6 +139,7 @@
     "@types/segment-analytics": "^0.0.34",
     "@types/supertest": "^2.0.8",
     "@types/uuid": "^8.3.4",
+    "@types/webpack-bundle-analyzer": "^4.6.0",
     "@types/webpack-env": "^1.15.2",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "@typescript-eslint/parser": "^4.8.1",
@@ -171,7 +174,7 @@
     "eslint-plugin-react-hooks": "^4.0.8",
     "eslint-plugin-sonarjs": "^0.10.0",
     "file-loader": "^6.0.0",
-    "html-webpack-plugin": "^4.5.0",
+    "html-webpack-plugin": "^5.5.0",
     "husky": "^4.2.5",
     "identity-obj-proxy": "^3.0.0",
     "ioredis-mock": "^5.5.4",
@@ -180,7 +183,7 @@
     "jest-runner-groups": "^2.2.0",
     "jest-when": "^3.2.1",
     "lint-staged": "^10.2.11",
-    "mini-css-extract-plugin": "^1.3.1",
+    "mini-css-extract-plugin": "2.7.2",
     "moment": "^2.29.3",
     "monaco-editor-webpack-plugin": "^6.0.0",
     "msw": "^0.45.0",
@@ -201,13 +204,13 @@
     "ts-jest": "27.1.5",
     "ts-loader": "^6.2.1",
     "ts-mockito": "^2.6.1",
-    "ts-node": "^8.6.2",
+    "ts-node": "^10.9.1",
     "tsconfig-paths": "^3.9.0",
-    "tsconfig-paths-webpack-plugin": "^3.3.0",
+    "tsconfig-paths-webpack-plugin": "^4.0.1",
     "typescript": "^4.0.5",
     "url-loader": "^4.1.0",
     "webpack": "^5.5.1",
-    "webpack-bundle-analyzer": "^4.1.0",
+    "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^4.3.0",
     "webpack-dev-server": "^4.13.3",
     "webpack-merge": "^5.4.0",
diff --git a/redisinsight/about-panel.ts b/redisinsight/electron/about-panel.ts
similarity index 100%
rename from redisinsight/about-panel.ts
rename to redisinsight/electron/about-panel.ts
diff --git a/redisinsight/electron/index.ejs b/redisinsight/electron/index.ejs
new file mode 100644
index 0000000000..bb61a1b52d
--- /dev/null
+++ b/redisinsight/electron/index.ejs
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>RedisInsight</title>
+  </head>
+  <body class="electron">
+    <div id="root" style="height: 100%; width: 100%;"></div>
+  </body>
+</html>
diff --git a/redisinsight/index.html b/redisinsight/electron/index.html
similarity index 85%
rename from redisinsight/index.html
rename to redisinsight/electron/index.html
index a9aa8b600b..2de75da4ec 100644
--- a/redisinsight/index.html
+++ b/redisinsight/electron/index.html
@@ -6,7 +6,7 @@
   <script>
     (() => {
 
-      if (process?.env?.NODE_ENV !== 'development') {
+      if (envVars.NODE_ENV !== 'development') {
         const link = document.createElement('link');
         link.rel = 'stylesheet';
         link.href = './dist/style.css';
@@ -19,16 +19,16 @@
 <body class="electron">
   <div id="root" style="height: 100%; width: 100%;"></div>
   <script>
-    if (typeof process === 'object') {
+    if (typeof envVars === 'object') {
       const scripts = [];
 
-      if (process.env.NODE_ENV === 'development') {
+      if (envVars.NODE_ENV === 'development') {
         // Dynamically insert the DLL script in development env in the
         // renderer process
         scripts.push('../dll/renderer.dev.dll.js');
 
         // Dynamically insert the bundled app script in the renderer process
-        const port = process.env.PORT || 1212;
+        const port = envVars.PORT || 1212;
         scripts.push(`http://localhost:${port}/dist/renderer.dev.js`);
       } else {
         scripts.push('./dist/renderer.prod.js');
diff --git a/redisinsight/main.dev.ts b/redisinsight/electron/main.dev.ts
similarity index 93%
rename from redisinsight/main.dev.ts
rename to redisinsight/electron/main.dev.ts
index 2f2680e2ea..c84ec504dc 100644
--- a/redisinsight/main.dev.ts
+++ b/redisinsight/electron/main.dev.ts
@@ -34,8 +34,9 @@ import MenuBuilder from './menu';
 import AboutPanelOptions from './about-panel';
 // eslint-disable-next-line import/no-cycle
 import TrayBuilder from './tray';
-import server from './api/dist/src/main';
-import { ElectronStorageItem, IpcEvent } from './ui/src/electron/constants';
+import server from '../api/dist/src/main';
+import { ElectronStorageItem, IpcEvent } from '../ui/src/electron/constants';
+import { resolveHtmlPath } from './util';
 
 if (process.env.NODE_ENV !== 'production') {
   log.transports.file.getFile().clear();
@@ -161,7 +162,7 @@ export const windows = new Set<BrowserWindow>();
 const getAssetPath = (...paths: string[]): string => {
   const RESOURCES_PATH = app.isPackaged
     ? path.join(process.resourcesPath, 'resources')
-    : path.join(__dirname, '../resources');
+    : path.join(__dirname, '../../resources');
 
   return path.join(RESOURCES_PATH, ...paths);
 };
@@ -178,12 +179,12 @@ export const createSplashScreen = async () => {
     title: titleSplash,
     icon: getAssetPath('icon.png'),
     webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false,
+      nodeIntegration: false,
+      contextIsolation: true,
     },
   });
 
-  splash.loadURL(`file://${__dirname}/splash.html`);
+  splash.loadURL(resolveHtmlPath('splash.html'));
 
   return splash;
 };
@@ -210,17 +211,20 @@ export const createWindow = async (splash: BrowserWindow | null = null) => {
     // titleBarStyle: 'hidden',
     icon: getAssetPath('icon.png'),
     webPreferences: {
-      nodeIntegration: true,
-      nodeIntegrationInWorker: true,
+      contextIsolation: true,
+      nodeIntegration: false,
+      nodeIntegrationInWorker: false,
       webSecurity: true,
-      contextIsolation: false,
       spellcheck: true,
       allowRunningInsecureContent: false,
       scrollBounce: true,
+      preload: app.isPackaged
+        ? path.join(__dirname, 'preload.js')
+        : path.join(__dirname, './dll/preload.js'),
     },
   });
 
-  newWindow.loadURL(`file://${__dirname}/index.html`);
+  newWindow.loadURL(resolveHtmlPath('index.html'));
 
   newWindow.webContents.on('did-finish-load', () => {
     if (!newWindow) {
@@ -288,6 +292,11 @@ export const createWindow = async (splash: BrowserWindow | null = null) => {
     shell.openExternal(url);
   });
 
+  newWindow.webContents.setWindowOpenHandler((edata: any) => {
+    shell.openExternal(edata.url);
+    return { action: 'deny' };
+  });
+
   // event newWindow.webContents.on('context-menu', ...)
   contextMenu({ window: newWindow, showInspectElement: true });
 
diff --git a/redisinsight/menu.ts b/redisinsight/electron/menu.ts
similarity index 99%
rename from redisinsight/menu.ts
rename to redisinsight/electron/menu.ts
index ec7f872bf5..7931de6882 100644
--- a/redisinsight/menu.ts
+++ b/redisinsight/electron/menu.ts
@@ -6,7 +6,7 @@ import {
   MenuItemConstructorOptions,
   MenuItem,
 } from 'electron';
-import { ElectronStorageItem } from './ui/src/electron/constants';
+import { ElectronStorageItem } from '../ui/src/electron/constants';
 // eslint-disable-next-line import/no-cycle
 import {
   createWindow,
diff --git a/redisinsight/electron/preload.ts b/redisinsight/electron/preload.ts
new file mode 100644
index 0000000000..914f372490
--- /dev/null
+++ b/redisinsight/electron/preload.ts
@@ -0,0 +1,26 @@
+// Disable no-unused-vars, broken for spread args
+/* eslint no-unused-vars: off */
+import { contextBridge, ipcRenderer } from 'electron';
+import { IpcEvent } from 'uiSrc/electron/constants';
+
+const electronHandler = {
+  ipcRenderer: {
+    invoke: (channel: IpcEvent, data?: any) => {
+      // whitelist channels
+      if (Object.values(IpcEvent).includes(channel)) {
+        return ipcRenderer.invoke(channel, data);
+      }
+
+      return new Error('channel is not allowed');
+    },
+  },
+};
+
+contextBridge.exposeInMainWorld('electron', electronHandler);
+
+contextBridge.exposeInMainWorld('ENV_VARS', {
+  NODE_ENV: process.env.NODE_ENV,
+  API_PORT: process.env.API_PORT,
+});
+
+export type ElectronHandler = typeof electronHandler;
diff --git a/redisinsight/splash.html b/redisinsight/electron/splash.html
similarity index 100%
rename from redisinsight/splash.html
rename to redisinsight/electron/splash.html
diff --git a/redisinsight/tray.ts b/redisinsight/electron/tray.ts
similarity index 100%
rename from redisinsight/tray.ts
rename to redisinsight/electron/tray.ts
diff --git a/redisinsight/electron/util.ts b/redisinsight/electron/util.ts
new file mode 100644
index 0000000000..7775eda370
--- /dev/null
+++ b/redisinsight/electron/util.ts
@@ -0,0 +1,13 @@
+/* eslint import/prefer-default-export: off */
+import { URL } from 'url';
+import path from 'path';
+
+export function resolveHtmlPath(htmlFileName: string) {
+  if (process.env.NODE_ENV === 'development') {
+    const port = process.env.PORT || 1212;
+    const url = new URL(`http://localhost:${port}`);
+    url.pathname = htmlFileName;
+    return url.href;
+  }
+  return `file://${path.resolve(__dirname, '../renderer/', htmlFileName)}`;
+}
diff --git a/redisinsight/main.prod.js.LICENSE.txt b/redisinsight/main.prod.js.LICENSE.txt
deleted file mode 100644
index 969b42efcf..0000000000
--- a/redisinsight/main.prod.js.LICENSE.txt
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
-/*!
- * FileStreamRotator
- * Copyright(c) 2012-2017 Holiday Extras.
- * Copyright(c) 2017 Roger C.
- * MIT Licensed
- */
-
-/*!
- * accepts
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * body-parser
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2014-2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * body-parser
- * Copyright(c) 2014-2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * bytes
- * Copyright(c) 2012-2014 TJ Holowaychuk
- * Copyright(c) 2015 Jed Watson
- * MIT Licensed
- */
-
-/*!
- * content-disposition
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * content-type
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * cookie
- * Copyright(c) 2012-2014 Roman Shtylman
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * depd
- * Copyright(c) 2014 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * depd
- * Copyright(c) 2014-2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * depd
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * depd
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * destroy
- * Copyright(c) 2014 Jonathan Ong
- * MIT Licensed
- */
-
-/*!
- * ee-first
- * Copyright(c) 2014 Jonathan Ong
- * MIT Licensed
- */
-
-/*!
- * encodeurl
- * Copyright(c) 2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * escape-html
- * Copyright(c) 2012-2013 TJ Holowaychuk
- * Copyright(c) 2015 Andreas Lubbe
- * Copyright(c) 2015 Tiancheng "Timothy" Gu
- * MIT Licensed
- */
-
-/*!
- * etag
- * Copyright(c) 2014-2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * express
- * Copyright(c) 2009-2013 TJ Holowaychuk
- * Copyright(c) 2013 Roman Shtylman
- * Copyright(c) 2014-2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * express
- * Copyright(c) 2009-2013 TJ Holowaychuk
- * Copyright(c) 2014-2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * finalhandler
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * forwarded
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * fresh
- * Copyright(c) 2012 TJ Holowaychuk
- * Copyright(c) 2016-2017 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * http-errors
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * media-typer
- * Copyright(c) 2014 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * merge-descriptors
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * methods
- * Copyright(c) 2013-2014 TJ Holowaychuk
- * Copyright(c) 2015-2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * mime-db
- * Copyright(c) 2014 Jonathan Ong
- * MIT Licensed
- */
-
-/*!
- * mime-types
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * negotiator
- * Copyright(c) 2012 Federico Romero
- * Copyright(c) 2012-2014 Isaac Z. Schlueter
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * on-finished
- * Copyright(c) 2013 Jonathan Ong
- * Copyright(c) 2014 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * parseurl
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * proxy-addr
- * Copyright(c) 2014-2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * range-parser
- * Copyright(c) 2012-2014 TJ Holowaychuk
- * Copyright(c) 2015-2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * raw-body
- * Copyright(c) 2013-2014 Jonathan Ong
- * Copyright(c) 2014-2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * send
- * Copyright(c) 2012 TJ Holowaychuk
- * Copyright(c) 2014-2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * serve-static
- * Copyright(c) 2010 Sencha Inc.
- * Copyright(c) 2011 TJ Holowaychuk
- * Copyright(c) 2014-2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * statuses
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * toidentifier
- * Copyright(c) 2016 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * type-is
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2014-2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * unpipe
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- * vary
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/*!
- */
-
-/*! *****************************************************************************
-Copyright (C) Microsoft. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-/*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/**
- * @license
- * Lodash <https://lodash.com/>
- * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */
-
-//! moment.js
-
-//! moment.js locale configuration
diff --git a/redisinsight/main.renderer.ts b/redisinsight/main.renderer.ts
deleted file mode 100644
index 9ab5f32874..0000000000
--- a/redisinsight/main.renderer.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Titlebar, Color } from 'custom-electron-titlebar';
-
-const MyTitleBar = new Titlebar({
-  backgroundColor: Color.fromHex('#101317'),
-  shadow: true,
-});
-
-MyTitleBar.updateTitle('RedisInsight');
diff --git a/redisinsight/package.json b/redisinsight/package.json
index 5c855ba39e..23d79d3d29 100644
--- a/redisinsight/package.json
+++ b/redisinsight/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "version": "2.26.0",
   "description": "RedisInsight",
-  "main": "./main.prod.js",
+  "main": "./dist/main/main.js",
   "author": {
     "name": "Redis Ltd.",
     "email": "support@redis.com",
diff --git a/redisinsight/ui/indexElectron.tsx b/redisinsight/ui/indexElectron.tsx
index 81f37a7af5..34d239747a 100644
--- a/redisinsight/ui/indexElectron.tsx
+++ b/redisinsight/ui/indexElectron.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { render } from 'react-dom'
+import { createRoot } from 'react-dom/client'
 import AppElectron from 'uiSrc/electron/AppElectron'
 import { listenPluginsEvents } from 'uiSrc/plugins/pluginEvents'
 import 'uiSrc/styles/base/_fonts.scss'
@@ -8,4 +8,5 @@ import 'uiSrc/styles/main.scss'
 listenPluginsEvents()
 
 const rootEl = document.getElementById('root')
-render(<AppElectron />, rootEl)
+const root = createRoot(rootEl!)
+root.render(<AppElectron />)
diff --git a/redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx b/redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx
index 6033b5c41f..80f5658d62 100644
--- a/redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx
+++ b/redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect } from 'react'
-import { DatabaseOverview } from 'uiSrc/components'
 import { useDispatch, useSelector } from 'react-redux'
+import { DatabaseOverview } from 'uiSrc/components'
 import {
   connectedInstanceOverviewSelector,
   connectedInstanceSelector,
diff --git a/redisinsight/ui/src/components/page-placeholder/PagePlaceholder.tsx b/redisinsight/ui/src/components/page-placeholder/PagePlaceholder.tsx
index ad3e3bb1e6..4190fb4822 100644
--- a/redisinsight/ui/src/components/page-placeholder/PagePlaceholder.tsx
+++ b/redisinsight/ui/src/components/page-placeholder/PagePlaceholder.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
-import { ReactComponent as LogoIcon } from 'uiSrc/assets/img/logo.svg'
 import { EuiLoadingLogo, EuiEmptyPrompt } from '@elastic/eui'
+import { ReactComponent as LogoIcon } from 'uiSrc/assets/img/logo.svg'
 
 const PagePlaceholder = () => (
   <>
diff --git a/redisinsight/ui/src/constants/index.ts b/redisinsight/ui/src/constants/index.ts
index a424dea36d..5aef8096ef 100644
--- a/redisinsight/ui/src/constants/index.ts
+++ b/redisinsight/ui/src/constants/index.ts
@@ -3,8 +3,8 @@ import BrowserStorageItem from './storage'
 import ApiStatusCode from './apiStatusCode'
 import apiErrors from './apiErrors'
 
-export * from './themes'
 export * from './keys'
+export * from './themes'
 export * from './table'
 export * from './redisinsight'
 export * from './commands'
diff --git a/redisinsight/ui/src/electron/components/ConfigElectron/ConfigElectron.tsx b/redisinsight/ui/src/electron/components/ConfigElectron/ConfigElectron.tsx
index 41f82770eb..bc1ae0b17f 100644
--- a/redisinsight/ui/src/electron/components/ConfigElectron/ConfigElectron.tsx
+++ b/redisinsight/ui/src/electron/components/ConfigElectron/ConfigElectron.tsx
@@ -1,11 +1,11 @@
 import { useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { ipcCheckUpdates, ipcSendEvents } from 'uiSrc/electron/utils'
 import {
   appAnalyticsInfoSelector,
   appServerInfoSelector,
   appElectronInfoSelector
 } from 'uiSrc/slices/app/info'
+import { ipcCheckUpdates, ipcSendEvents } from 'uiSrc/electron/utils'
 import { ipcDeleteDownloadedVersion } from 'uiSrc/electron/utils/ipcDeleteStoreValues'
 
 const ConfigElectron = () => {
diff --git a/redisinsight/ui/src/electron/preload.d.ts b/redisinsight/ui/src/electron/preload.d.ts
new file mode 100644
index 0000000000..fcebdb32c3
--- /dev/null
+++ b/redisinsight/ui/src/electron/preload.d.ts
@@ -0,0 +1,10 @@
+import { ElectronHandler } from '../../../electron/preload'
+
+declare global {
+  // eslint-disable-next-line no-unused-vars
+  interface Window {
+    electron: ElectronHandler;
+  }
+}
+
+export {}
diff --git a/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts b/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts
index bdd77d5b33..5029c72236 100644
--- a/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts
+++ b/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts
@@ -1,4 +1,3 @@
-import { ipcRenderer } from 'electron'
 import { Dispatch } from 'react'
 import { omit } from 'lodash'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
@@ -10,13 +9,13 @@ import { GetServerInfoResponse } from 'apiSrc/modules/server/dto/server.dto'
 import { ElectronStorageItem, IpcEvent } from '../constants'
 
 export const ipcCheckUpdates = async (serverInfo: GetServerInfoResponse, dispatch: Dispatch<any>) => {
-  const isUpdateDownloaded = await ipcRenderer.invoke(
+  const isUpdateDownloaded = await window.electron.ipcRenderer.invoke(
     IpcEvent.getStoreValue, ElectronStorageItem.updateDownloaded
   )
-  const isUpdateAvailable = await ipcRenderer.invoke(
+  const isUpdateAvailable = await window.electron.ipcRenderer.invoke(
     IpcEvent.getStoreValue, ElectronStorageItem.isUpdateAvailable
   )
-  const updateDownloadedVersion = await ipcRenderer.invoke(
+  const updateDownloadedVersion = await window.electron.ipcRenderer.invoke(
     IpcEvent.getStoreValue,
     ElectronStorageItem.updateDownloadedVersion
   )
@@ -36,7 +35,7 @@ export const ipcCheckUpdates = async (serverInfo: GetServerInfoResponse, dispatc
       ))
     }
 
-    await ipcRenderer.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloaded)
+    await window.electron.ipcRenderer.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloaded)
   }
 
   if (updateDownloadedVersion && !isUpdateAvailable && serverInfo.appVersion === updateDownloadedVersion) {
@@ -47,19 +46,19 @@ export const ipcCheckUpdates = async (serverInfo: GetServerInfoResponse, dispatc
 }
 
 export const ipcSendEvents = async (serverInfo: GetServerInfoResponse) => {
-  const isUpdateDownloadedForTelemetry = await ipcRenderer.invoke(
+  const isUpdateDownloadedForTelemetry = await window.electron.ipcRenderer.invoke(
     IpcEvent.getStoreValue, ElectronStorageItem.updateDownloadedForTelemetry
   )
-  const isUpdateAvailable = await ipcRenderer.invoke(
+  const isUpdateAvailable = await window.electron.ipcRenderer.invoke(
     IpcEvent.getStoreValue, ElectronStorageItem.isUpdateAvailable
   )
 
   if (isUpdateDownloadedForTelemetry && !isUpdateAvailable) {
-    const newVer = await ipcRenderer.invoke(
+    const newVer = await window.electron.ipcRenderer.invoke(
       IpcEvent.getStoreValue,
       ElectronStorageItem.updateDownloadedVersion
     )
-    const prevVer = await ipcRenderer.invoke(
+    const prevVer = await window.electron.ipcRenderer.invoke(
       IpcEvent.getStoreValue,
       ElectronStorageItem.updatePreviousVersion
     )
@@ -71,6 +70,9 @@ export const ipcSendEvents = async (serverInfo: GetServerInfoResponse) => {
         toVersion: newVer
       },
     })
-    await ipcRenderer.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloadedForTelemetry)
+    await window.electron.ipcRenderer.invoke(
+      IpcEvent.deleteStoreValue,
+      ElectronStorageItem.updateDownloadedForTelemetry,
+    )
   }
 }
diff --git a/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts b/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts
index 4878f6fa21..019c6dab08 100644
--- a/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts
+++ b/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts
@@ -1,6 +1,5 @@
-import { ipcRenderer } from 'electron'
 import { ElectronStorageItem, IpcEvent } from 'uiSrc/electron/constants'
 
 export const ipcDeleteDownloadedVersion = async () => {
-  await ipcRenderer.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloadedVersion)
+  await window.electron.ipcRenderer.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloadedVersion)
 }
diff --git a/redisinsight/ui/src/services/apiService.ts b/redisinsight/ui/src/services/apiService.ts
index 6539d161ad..a21366dcba 100644
--- a/redisinsight/ui/src/services/apiService.ts
+++ b/redisinsight/ui/src/services/apiService.ts
@@ -3,8 +3,8 @@ import { isNumber } from 'lodash'
 import { sessionStorageService } from 'uiSrc/services'
 import { BrowserStorageItem } from 'uiSrc/constants'
 
+const apiPort = window.ENV_VARS.API_PORT
 const baseApiUrl = process.env.BASE_API_URL
-const apiPort = process.env.API_PORT
 const apiPrefix = process.env.API_PREFIX
 const isDevelopment = process.env.NODE_ENV === 'development'
 const isWebApp = process.env.APP_ENV === 'web'
diff --git a/redisinsight/ui/src/services/resourcesService.ts b/redisinsight/ui/src/services/resourcesService.ts
index eafc06d145..2e7ba18b9b 100644
--- a/redisinsight/ui/src/services/resourcesService.ts
+++ b/redisinsight/ui/src/services/resourcesService.ts
@@ -1,8 +1,8 @@
 import axios from 'axios'
 import { IS_ABSOLUTE_PATH } from 'uiSrc/constants/regex'
 
+const apiPort = window.ENV_VARS.API_PORT
 const baseApiUrl = process.env.BASE_API_URL
-const apiPort = process.env.API_PORT
 const isDevelopment = process.env.NODE_ENV === 'development'
 const isWebApp = process.env.APP_ENV === 'web'
 
diff --git a/redisinsight/ui/src/types/index.d.ts b/redisinsight/ui/src/types/index.d.ts
index 8732742b1f..8bf6985784 100644
--- a/redisinsight/ui/src/types/index.d.ts
+++ b/redisinsight/ui/src/types/index.d.ts
@@ -1,6 +1,6 @@
 import { Buffer } from 'buffer'
 // eslint-disable-next-line import/order
-import { Nullable } from 'uiSrc/utils'
+import { Nullable, EnvVars } from 'uiSrc/utils'
 import { KeyValueCompressor } from 'uiSrc/constants'
 import { RedisResponseBuffer, RedisString, UintArray } from 'uiSrc/slices/interfaces'
 
@@ -8,6 +8,7 @@ declare global {
   interface Window {
     ri: RedisInsight
     Buffer: typeof Buffer
+    ENV_VARS: EnvVars
   }
 
   interface RedisInsight {
diff --git a/redisinsight/ui/src/utils/common.ts b/redisinsight/ui/src/utils/common.ts
index d8c5616a60..98da5bf2b7 100644
--- a/redisinsight/ui/src/utils/common.ts
+++ b/redisinsight/ui/src/utils/common.ts
@@ -1,7 +1,7 @@
 const baseApiUrl = process.env.BASE_API_URL
 const isDevelopment = process.env.NODE_ENV === 'development'
 const isWebApp = process.env.APP_ENV === 'web'
-const apiPort = process.env.API_PORT
+const apiPort = window.ENV_VARS.API_PORT
 
 export const getBaseApiUrl = () => (!isDevelopment && isWebApp
   ? window.location.origin
diff --git a/scripts/check-port-in-use.js b/scripts/check-port-in-use.js
new file mode 100644
index 0000000000..3ade730a71
--- /dev/null
+++ b/scripts/check-port-in-use.js
@@ -0,0 +1,16 @@
+import chalk from 'chalk';
+import detectPort from 'detect-port';
+
+const port = process.env.PORT || '1212';
+
+detectPort(port, (err, availablePort) => {
+  if (port !== String(availablePort)) {
+    throw new Error(
+      chalk.whiteBright.bgRed.bold(
+        `Port "${port}" on "localhost" is already in use. Please use another port. ex: PORT=4343 npm start`
+      )
+    );
+  } else {
+    process.exit(0);
+  }
+});
diff --git a/scripts/prebuild.js b/scripts/prebuild.js
new file mode 100644
index 0000000000..d58ed32bb3
--- /dev/null
+++ b/scripts/prebuild.js
@@ -0,0 +1,15 @@
+import rimraf from 'rimraf';
+import fs from 'fs';
+import webpackPaths from '../configs/webpack.paths';
+
+const foldersToRemove = [
+  webpackPaths.distPath,
+  webpackPaths.buildPath,
+];
+
+// remove dist folders
+foldersToRemove.forEach((folder) => {
+  if (fs.existsSync(folder)) rimraf.sync(folder);
+});
+
+
diff --git a/tsconfig.json b/tsconfig.json
index d186db58cb..5545e47925 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -47,10 +47,11 @@
     "redisinsight/ui/src/**/*",
     "redisinsight/ui/index.tsx",
     "redisinsight/ui/indexElectron.tsx",
-    "redisinsight/main.dev.ts",
+    "redisinsight/electron/**/*",
     "jest.config.js"
   ],
   "exclude": [
+    "./redisinsight/electron/dll/*",
     "./redisinsight/api",
     "**/main.prod.js",
     "**/renderer.prod.js",
diff --git a/yarn.lock b/yarn.lock
index de11749934..fa4b28f5b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1189,6 +1189,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
 "@develar/schema-utils@~2.6.5":
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
@@ -1548,12 +1555,17 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
+
 "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
+"@jridgewell/source-map@^0.3.3":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda"
   integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==
@@ -1571,6 +1583,14 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.18"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
@@ -2000,6 +2020,26 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
+"@tsconfig/node10@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
 "@types/aria-query@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
@@ -2450,10 +2490,10 @@
   dependencies:
     html-entities "*"
 
-"@types/html-minifier-terser@^5.0.0":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
-  integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==
+"@types/html-minifier-terser@^6.0.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
+  integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
 "@types/http-cache-semantics@*":
   version "4.0.1"
@@ -2861,11 +2901,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/source-list-map@*":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
-  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
-
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
@@ -2886,11 +2921,6 @@
   dependencies:
     "@types/superagent" "*"
 
-"@types/tapable@^1", "@types/tapable@^1.0.5":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
-  integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
-
 "@types/testing-library__jest-dom@^5.9.1":
   version "5.14.5"
   resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f"
@@ -2903,13 +2933,6 @@
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
   integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
 
-"@types/uglify-js@*":
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.1.tgz#e0ffcef756476410e5bce2cb01384ed878a195b5"
-  integrity sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==
-  dependencies:
-    source-map "^0.6.1"
-
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
@@ -2932,32 +2955,20 @@
   dependencies:
     vfile-message "*"
 
+"@types/webpack-bundle-analyzer@^4.6.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.0.tgz#8863d62d2432126c2b3a9239cafa469215981c24"
+  integrity sha512-XeQmQCCXdZdap+A/60UKmxW5Mz31Vp9uieGlHB3T4z/o2OLVLtTI3bvTuS6A2OWd/rbAAQiGGWIEFQACu16szA==
+  dependencies:
+    "@types/node" "*"
+    tapable "^2.2.0"
+    webpack "^5"
+
 "@types/webpack-env@^1.15.2":
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.0.tgz#ed6ecaa8e5ed5dfe8b2b3d00181702c9925f13fb"
   integrity sha512-56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg==
 
-"@types/webpack-sources@*":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b"
-  integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==
-  dependencies:
-    "@types/node" "*"
-    "@types/source-list-map" "*"
-    source-map "^0.7.3"
-
-"@types/webpack@^4.41.8":
-  version "4.41.33"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.33.tgz#16164845a5be6a306bcbe554a8e67f9cac215ffc"
-  integrity sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==
-  dependencies:
-    "@types/node" "*"
-    "@types/tapable" "^1"
-    "@types/uglify-js" "*"
-    "@types/webpack-sources" "*"
-    anymatch "^3.0.0"
-    source-map "^0.6.0"
-
 "@types/ws@^8.5.1":
   version "8.5.4"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5"
@@ -3298,10 +3309,10 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.1:
   version "5.3.2"
@@ -3313,7 +3324,7 @@ acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.0:
+acorn-walk@^8.0.0, acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -3323,7 +3334,7 @@ acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.0.5, acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1:
+acorn@^8.0.4, acorn@^8.0.5, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2:
   version "8.8.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
@@ -3457,7 +3468,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -3626,17 +3637,6 @@ array.prototype.flatmap@^1.3.1:
     es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.reduce@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
-  integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.7"
-
 array.prototype.tosorted@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
@@ -4365,7 +4365,7 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@^4.1.1:
+camel-case@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
   integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
@@ -4574,10 +4574,10 @@ classnames@*, classnames@^2.2.6, classnames@^2.3.1:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
   integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
-clean-css@^4.2.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
-  integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==
+clean-css@^5.2.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.2.tgz#70ecc7d4d4114921f5d298349ff86a31a9975224"
+  integrity sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==
   dependencies:
     source-map "~0.6.0"
 
@@ -4762,11 +4762,6 @@ commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
 commander@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
@@ -4777,6 +4772,11 @@ commander@^6.1.0, commander@^6.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
+commander@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
 common-path-prefix@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
@@ -5024,6 +5024,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
 cross-env@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
@@ -5620,7 +5625,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
   integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
@@ -6218,10 +6223,10 @@ enhanced-resolve@^4.0.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-enhanced-resolve@^5.13.0, enhanced-resolve@^5.7.0:
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz#26d1ecc448c02de997133217b5c1053f34a0a275"
-  integrity sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==
+enhanced-resolve@^5.14.1, enhanced-resolve@^5.7.0:
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz#de684b6803724477a4af5d74ccae5de52c25f6b3"
+  integrity sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -6284,7 +6289,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.3.4"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
+es-abstract@^1.19.0, es-abstract@^1.20.4:
   version "1.21.2"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
   integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
@@ -6324,11 +6329,6 @@ es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.9"
 
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
 es-get-iterator@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
@@ -7093,7 +7093,7 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-focus-lock@0.9.2:
+focus-lock@^0.9.2:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.9.2.tgz#9d30918aaa99b1b97677731053d017f82a540d5b"
   integrity sha512-YtHxjX7a0IC0ZACL5wsX8QdncXofWpGPNoVMuI/nZUrPGp6LmNI6+D5j0pPj+v8Kw5EpweA+T5yImK0rnWf7oQ==
@@ -7922,18 +7922,18 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-minifier-terser@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
-  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
+html-minifier-terser@^6.0.2:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
+  integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==
   dependencies:
-    camel-case "^4.1.1"
-    clean-css "^4.2.3"
-    commander "^4.1.1"
+    camel-case "^4.1.2"
+    clean-css "^5.2.2"
+    commander "^8.3.0"
     he "^1.2.0"
-    param-case "^3.0.3"
+    param-case "^3.0.4"
     relateurl "^0.2.7"
-    terser "^4.6.3"
+    terser "^5.10.0"
 
 html-react-parser@^1.2.4:
   version "1.4.14"
@@ -7955,20 +7955,16 @@ html-void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-2.0.1.tgz#29459b8b05c200b6c5ee98743c41b979d577549f"
   integrity sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==
 
-html-webpack-plugin@^4.5.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
-  integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
+html-webpack-plugin@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.1.tgz#826838e31b427f5f7f30971f8d8fa2422dfa6763"
+  integrity sha512-cTUzZ1+NqjGEKjmVgZKLMdiFg3m9MdRXkZW2OEe69WYVi5ONLMmlnSZdXzGGMOq0C8jGDrL6EWyEDDUioHO/pA==
   dependencies:
-    "@types/html-minifier-terser" "^5.0.0"
-    "@types/tapable" "^1.0.5"
-    "@types/webpack" "^4.41.8"
-    html-minifier-terser "^5.0.1"
-    loader-utils "^1.2.3"
-    lodash "^4.17.20"
-    pretty-error "^2.1.1"
-    tapable "^1.1.3"
-    util.promisify "1.0.0"
+    "@types/html-minifier-terser" "^6.0.0"
+    html-minifier-terser "^6.0.2"
+    lodash "^4.17.21"
+    pretty-error "^4.0.0"
+    tapable "^2.0.0"
 
 htmlparser2@7.2.0:
   version "7.2.0"
@@ -10431,14 +10427,12 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-css-extract-plugin@^1.3.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8"
-  integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==
+mini-css-extract-plugin@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz#e049d3ea7d3e4e773aad585c6cb329ce0c7b72d7"
+  integrity sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==
   dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-    webpack-sources "^1.1.0"
+    schema-utils "^4.0.0"
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
@@ -10983,17 +10977,6 @@ object.fromentries@^2.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
-  integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
-  dependencies:
-    array.prototype.reduce "^1.0.5"
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.21.2"
-    safe-array-concat "^1.0.0"
-
 object.hasown@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
@@ -11190,7 +11173,7 @@ pako@~1.0.2, pako@~1.0.5:
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
-param-case@^3.0.3:
+param-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
   integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
@@ -11677,13 +11660,13 @@ prettier@*:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-pretty-error@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
-  integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
+pretty-error@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
+  integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==
   dependencies:
     lodash "^4.17.20"
-    renderkid "^2.0.4"
+    renderkid "^3.0.0"
 
 pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
   version "27.5.1"
@@ -12542,16 +12525,16 @@ remark-rehype@^8.0.0:
   dependencies:
     mdast-util-to-hast "^10.2.0"
 
-renderkid@^2.0.4:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
-  integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
+renderkid@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a"
+  integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==
   dependencies:
     css-select "^4.1.3"
     dom-converter "^0.2.0"
     htmlparser2 "^6.1.0"
     lodash "^4.17.21"
-    strip-ansi "^3.0.1"
+    strip-ansi "^6.0.1"
 
 repeat-string@^1.5.4:
   version "1.6.1"
@@ -12771,16 +12754,6 @@ sade@^1.7.3:
   dependencies:
     mri "^1.1.0"
 
-safe-array-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
-  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
-    has-symbols "^1.0.3"
-    isarray "^2.0.5"
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -13197,17 +13170,12 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+source-map-support@^0.5.16, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -13737,12 +13705,12 @@ tapable@^0.1.8:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
   integrity sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==
 
-tapable@^1.0.0, tapable@^1.1.3:
+tapable@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tapable@^2.1.1, tapable@^2.2.0:
+tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
@@ -13786,22 +13754,13 @@ terser-webpack-plugin@^5.0.3, terser-webpack-plugin@^5.3.7:
     serialize-javascript "^6.0.1"
     terser "^5.16.5"
 
-terser@^4.6.3:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
-  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-terser@^5.16.5:
-  version "5.17.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69"
-  integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==
+terser@^5.10.0, terser@^5.16.5:
+  version "5.17.7"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.7.tgz#2a8b134826fe179b711969fd9d9a0c2479b2a8c3"
+  integrity sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -14025,25 +13984,33 @@ ts-mockito@^2.6.1:
   dependencies:
     lodash "^4.17.5"
 
-ts-node@^8.6.2:
-  version "8.10.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"
-  integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==
-  dependencies:
+ts-node@^10.9.1:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
     arg "^4.1.0"
+    create-require "^1.1.0"
     diff "^4.0.1"
     make-error "^1.1.1"
-    source-map-support "^0.5.17"
+    v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
-tsconfig-paths-webpack-plugin@^3.3.0:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz#01aafff59130c04a8c4ebc96a3045c43c376449a"
-  integrity sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw==
+tsconfig-paths-webpack-plugin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.0.1.tgz#a24651d0f69668a1abad38d3c2489855c257460d"
+  integrity sha512-m5//KzLoKmqu2MVix+dgLKq70MnFi8YL8sdzQZ6DblmCdfuq/y3OqvJd5vMndg2KEVCOeNz8Es4WVZhYInteLw==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.7.0"
-    tsconfig-paths "^3.9.0"
+    tsconfig-paths "^4.1.2"
 
 tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0:
   version "3.14.2"
@@ -14055,6 +14022,15 @@ tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tsconfig-paths@^4.1.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
@@ -14511,14 +14487,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util.promisify@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -14574,6 +14542,11 @@ uvu@^0.5.0:
     kleur "^4.0.3"
     sade "^1.7.3"
 
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -14755,7 +14728,7 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-bundle-analyzer@^4.1.0:
+webpack-bundle-analyzer@^4.8.0:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
   integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
@@ -14844,23 +14817,15 @@ webpack-merge@^5.4.0, webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-sources@^1.1.0:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.5.1:
-  version "5.81.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.81.0.tgz#27a2e8466c8b4820d800a8d90f06ef98294f9956"
-  integrity sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==
+webpack@^5, webpack@^5.5.1:
+  version "5.85.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.85.1.tgz#d77406352f8f14ec847c54e4dcfb80b28c776b3f"
+  integrity sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.0"
@@ -14868,10 +14833,10 @@ webpack@^5.5.1:
     "@webassemblyjs/wasm-edit" "^1.11.5"
     "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
+    acorn-import-assertions "^1.9.0"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.13.0"
+    enhanced-resolve "^5.14.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"