diff --git a/packages/plugins/ui-theme/package.json b/packages/plugins/ui-theme/package.json
index e6f80a84d..e0c94daad 100644
--- a/packages/plugins/ui-theme/package.json
+++ b/packages/plugins/ui-theme/package.json
@@ -17,7 +17,7 @@
     "npm": ">=6"
   },
   "devDependencies": {
-    "@types/react": "17.0.34",
+    "@types/react": "17.0.36",
     "@types/react-autosuggest": "10.1.5",
     "@types/react-dom": "17.0.11",
     "@types/react-helmet": "6.1.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d2b3b020..db1080c73 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -747,7 +747,7 @@ importers:
       '@testing-library/dom': 8.11.1
       '@testing-library/jest-dom': 5.14.1
       '@testing-library/react': 12.1.2
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       '@types/react-autosuggest': 10.1.5
       '@types/react-dom': 17.0.11
       '@types/react-helmet': 6.1.4
@@ -816,17 +816,17 @@ importers:
       '@emotion/babel-plugin': 11.0.0_@babel+core@7.16.0
       '@emotion/css': 11.5.0_@babel+core@7.16.0
       '@emotion/jest': 11.5.0_@types+jest@27.0.3
-      '@emotion/react': 11.5.0_28e268b6e995f612fbd8c21cb20f5a87
-      '@emotion/styled': 11.3.0_35e73d8577c3da6e1694a7ef9df860bb
-      '@mui/icons-material': 5.0.5_6f8b071973a8a55760ef9e3ee086f55a
-      '@mui/material': 5.0.6_3906d6946435037e500f96d844e71e47
-      '@mui/styles': 5.0.2_27d7f75f5fffc1228c129be468caca5c
+      '@emotion/react': 11.5.0_ae0aa6f62664a7cb3b2f54c37ede002d
+      '@emotion/styled': 11.3.0_e7204ebcf00e81fee75ee97be46f9738
+      '@mui/icons-material': 5.0.5_667c40b637419e5f7ad8e738f1f34677
+      '@mui/material': 5.0.6_f8d419d8b6c9429771d4cf60ccbff692
+      '@mui/styles': 5.0.2_bb8e79a4a12a744c3dc48cdef194d579
       '@rematch/core': 2.2.0_redux@4.1.2
       '@rematch/loading': 2.1.2_@rematch+core@2.2.0
       '@testing-library/dom': 8.11.1
       '@testing-library/jest-dom': 5.14.1
       '@testing-library/react': 12.1.2_react-dom@17.0.2+react@17.0.2
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       '@types/react-autosuggest': 10.1.5
       '@types/react-dom': 17.0.11
       '@types/react-helmet': 6.1.4
@@ -863,7 +863,7 @@ importers:
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
       react-hook-form: 7.15.3_react@17.0.2
-      react-hot-loader: 4.13.0_c8c53a2a5a2c84791ce34d6dbdd05753
+      react-hot-loader: 4.13.0_597cb904b9c9ac48becb27bac7a6c943
       react-i18next: 11.12.0_i18next@20.6.1+react@17.0.2
       react-redux: 7.2.6_react-dom@17.0.2+react@17.0.2
       react-router: 5.2.1_react@17.0.2
@@ -6083,7 +6083,7 @@ packages:
     peerDependencies:
       react: '*'
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       prop-types: 15.7.2
       react: 17.0.2
     dev: false
@@ -6469,7 +6469,7 @@ packages:
     resolution: {integrity: sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==}
     dev: true
 
-  /@emotion/react/11.5.0_28e268b6e995f612fbd8c21cb20f5a87:
+  /@emotion/react/11.5.0_ae0aa6f62664a7cb3b2f54c37ede002d:
     resolution: {integrity: sha512-MYq/bzp3rYbee4EMBORCn4duPQfgpiEB5XzrZEBnUZAL80Qdfr7CEv/T80jwaTl/dnZmt9SnTa8NkTrwFNpLlw==}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -6488,7 +6488,7 @@ packages:
       '@emotion/sheet': 1.0.3
       '@emotion/utils': 1.0.0
       '@emotion/weak-memoize': 0.2.5
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       hoist-non-react-statics: 3.3.2
       react: 17.0.2
     dev: true
@@ -6517,7 +6517,7 @@ packages:
     resolution: {integrity: sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ==}
     dev: true
 
-  /@emotion/styled/11.3.0_35e73d8577c3da6e1694a7ef9df860bb:
+  /@emotion/styled/11.3.0_e7204ebcf00e81fee75ee97be46f9738:
     resolution: {integrity: sha512-fUoLcN3BfMiLlRhJ8CuPUMEyKkLEoM+n+UyAbnqGEsCd5IzKQ7VQFLtzpJOaCD2/VR2+1hXQTnSZXVJeiTNltA==}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -6534,10 +6534,10 @@ packages:
       '@babel/runtime': 7.15.4
       '@emotion/babel-plugin': 11.3.0_@babel+core@7.16.0
       '@emotion/is-prop-valid': 1.1.0
-      '@emotion/react': 11.5.0_28e268b6e995f612fbd8c21cb20f5a87
+      '@emotion/react': 11.5.0_ae0aa6f62664a7cb3b2f54c37ede002d
       '@emotion/serialize': 1.0.2
       '@emotion/utils': 1.0.0
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       react: 17.0.2
     dev: true
 
@@ -7058,7 +7058,7 @@ packages:
       - supports-color
     dev: true
 
-  /@mui/core/5.0.0-alpha.53_c8c53a2a5a2c84791ce34d6dbdd05753:
+  /@mui/core/5.0.0-alpha.53_597cb904b9c9ac48becb27bac7a6c943:
     resolution: {integrity: sha512-dTwuhzE0puewJ+/Cw35iAiaBGVcZqVyqspheQHVJuhysSd+o58SONRAiM6MQgI/iFKiJ57HKh+En1MwuC7DMLw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -7073,7 +7073,7 @@ packages:
       '@emotion/is-prop-valid': 1.1.0
       '@mui/utils': 5.0.1_react@17.0.2
       '@popperjs/core': 2.10.2
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       clsx: 1.1.1
       prop-types: 15.7.2
       react: 17.0.2
@@ -7081,7 +7081,7 @@ packages:
       react-is: 17.0.2
     dev: true
 
-  /@mui/icons-material/5.0.5_6f8b071973a8a55760ef9e3ee086f55a:
+  /@mui/icons-material/5.0.5_667c40b637419e5f7ad8e738f1f34677:
     resolution: {integrity: sha512-beJo4kmgZwr+2x0ppgHcqqdNQYX4WKddJyMn4eHJAh9dNAGyeY1AJ/8Po+TJKyoSr3C2ZqnW7WrSonAJr2HrUw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -7093,12 +7093,12 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.15.4
-      '@mui/material': 5.0.6_3906d6946435037e500f96d844e71e47
-      '@types/react': 17.0.34
+      '@mui/material': 5.0.6_f8d419d8b6c9429771d4cf60ccbff692
+      '@types/react': 17.0.36
       react: 17.0.2
     dev: true
 
-  /@mui/material/5.0.6_3906d6946435037e500f96d844e71e47:
+  /@mui/material/5.0.6_f8d419d8b6c9429771d4cf60ccbff692:
     resolution: {integrity: sha512-1NmLel2Q+PnSfhFhdrhTbZFLfGpGKcPbu8onwGJu+vbD3YMTjr8gXvQ/sYZC0Motfu8jLnQdlq4FD4fRhqndnw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -7116,13 +7116,13 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.15.4
-      '@emotion/react': 11.5.0_28e268b6e995f612fbd8c21cb20f5a87
-      '@emotion/styled': 11.3.0_35e73d8577c3da6e1694a7ef9df860bb
-      '@mui/core': 5.0.0-alpha.53_c8c53a2a5a2c84791ce34d6dbdd05753
-      '@mui/system': 5.0.6_af8478b1f25295880f25acdf7385e0f8
-      '@mui/types': 7.0.0_@types+react@17.0.34
+      '@emotion/react': 11.5.0_ae0aa6f62664a7cb3b2f54c37ede002d
+      '@emotion/styled': 11.3.0_e7204ebcf00e81fee75ee97be46f9738
+      '@mui/core': 5.0.0-alpha.53_597cb904b9c9ac48becb27bac7a6c943
+      '@mui/system': 5.0.6_2878a7b1139098c7d22a204491c179a6
+      '@mui/types': 7.0.0_@types+react@17.0.36
       '@mui/utils': 5.0.1_react@17.0.2
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       '@types/react-transition-group': 4.4.4
       clsx: 1.1.1
       csstype: 3.0.9
@@ -7134,7 +7134,7 @@ packages:
       react-transition-group: 4.4.2_react-dom@17.0.2+react@17.0.2
     dev: true
 
-  /@mui/private-theming/5.0.1_27d7f75f5fffc1228c129be468caca5c:
+  /@mui/private-theming/5.0.1_bb8e79a4a12a744c3dc48cdef194d579:
     resolution: {integrity: sha512-R8Cf2+32cG1OXFAqTighA5Mx9R5BQ57cN1ZVaNgfgdbI87Yig2fVMdFSPrw3txcjKlnwsvFJF8AdwQMqq1tJ3Q==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -7146,7 +7146,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.16.3
       '@mui/utils': 5.0.1_react@17.0.2
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       prop-types: 15.7.2
       react: 17.0.2
     dev: true
@@ -7166,13 +7166,13 @@ packages:
     dependencies:
       '@babel/runtime': 7.15.4
       '@emotion/cache': 11.5.0
-      '@emotion/react': 11.5.0_28e268b6e995f612fbd8c21cb20f5a87
-      '@emotion/styled': 11.3.0_35e73d8577c3da6e1694a7ef9df860bb
+      '@emotion/react': 11.5.0_ae0aa6f62664a7cb3b2f54c37ede002d
+      '@emotion/styled': 11.3.0_e7204ebcf00e81fee75ee97be46f9738
       prop-types: 15.7.2
       react: 17.0.2
     dev: true
 
-  /@mui/styles/5.0.2_27d7f75f5fffc1228c129be468caca5c:
+  /@mui/styles/5.0.2_bb8e79a4a12a744c3dc48cdef194d579:
     resolution: {integrity: sha512-ANYnMHpiWHcV0dMrzrdCzYm+kNU0f7Gc5nFLRDWF+8fWZ40K2Cg5eMRkOW/nmM5M0wtmDI+GFVsCXgZkNq89uw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -7184,10 +7184,10 @@ packages:
     dependencies:
       '@babel/runtime': 7.15.4
       '@emotion/hash': 0.8.0
-      '@mui/private-theming': 5.0.1_27d7f75f5fffc1228c129be468caca5c
-      '@mui/types': 7.0.0_@types+react@17.0.34
+      '@mui/private-theming': 5.0.1_bb8e79a4a12a744c3dc48cdef194d579
+      '@mui/types': 7.0.0_@types+react@17.0.36
       '@mui/utils': 5.0.1_react@17.0.2
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       clsx: 1.1.1
       csstype: 3.0.9
       hoist-non-react-statics: 3.3.2
@@ -7203,7 +7203,7 @@ packages:
       react: 17.0.2
     dev: true
 
-  /@mui/system/5.0.6_af8478b1f25295880f25acdf7385e0f8:
+  /@mui/system/5.0.6_2878a7b1139098c7d22a204491c179a6:
     resolution: {integrity: sha512-qZdgODiO82/r1bH9KV5bdqqx/q14i32OGUK/bO6phhXM/DX0TmWSUsnPqFX4F7/UKrvBHsGzIb8ohdRuihQD+Q==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -7220,20 +7220,20 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.15.4
-      '@emotion/react': 11.5.0_28e268b6e995f612fbd8c21cb20f5a87
-      '@emotion/styled': 11.3.0_35e73d8577c3da6e1694a7ef9df860bb
-      '@mui/private-theming': 5.0.1_27d7f75f5fffc1228c129be468caca5c
+      '@emotion/react': 11.5.0_ae0aa6f62664a7cb3b2f54c37ede002d
+      '@emotion/styled': 11.3.0_e7204ebcf00e81fee75ee97be46f9738
+      '@mui/private-theming': 5.0.1_bb8e79a4a12a744c3dc48cdef194d579
       '@mui/styled-engine': 5.0.2_5a47a31437ffba27a84f7efb2b21ce86
-      '@mui/types': 7.0.0_@types+react@17.0.34
+      '@mui/types': 7.0.0_@types+react@17.0.36
       '@mui/utils': 5.0.1_react@17.0.2
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       clsx: 1.1.1
       csstype: 3.0.9
       prop-types: 15.7.2
       react: 17.0.2
     dev: true
 
-  /@mui/types/7.0.0_@types+react@17.0.34:
+  /@mui/types/7.0.0_@types+react@17.0.36:
     resolution: {integrity: sha512-M/tkF2pZ4uoPhZ8pnNhlVnOFtz6F3dnYKIsnj8MuXKT6d26IE2u0UjA8B0275ggN74dR9rlHG5xJt5jgDx/Ung==}
     peerDependencies:
       '@types/react': '*'
@@ -7241,7 +7241,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
     dev: true
 
   /@mui/utils/5.0.1_react@17.0.2:
@@ -7767,7 +7767,7 @@ packages:
   /@types/hoist-non-react-statics/3.3.1:
     resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==}
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       hoist-non-react-statics: 3.3.2
     dev: true
 
@@ -7982,32 +7982,32 @@ packages:
   /@types/react-autosuggest/10.1.5:
     resolution: {integrity: sha512-qfMzrp6Is0VYRF5a97Bv/+P2F9ZtFY4YE2825yyWV4VxCpvcfvQHEqGNkDFIPme7t3B2BpQ784QBllYAxemERQ==}
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
     dev: true
 
   /@types/react-dom/17.0.11:
     resolution: {integrity: sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==}
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
     dev: true
 
   /@types/react-helmet/6.1.4:
     resolution: {integrity: sha512-jyx50RNZXVaTGHY3MsoRPNpeiVk8b0XTPgD/O6KHF6COTDnG/+lRjPYvTK5nfWtR3xDOux0w6bHLAsaHo2ZLTA==}
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
     dev: true
 
   /@types/react-is/17.0.3:
     resolution: {integrity: sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==}
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
     dev: true
 
   /@types/react-redux/7.1.20:
     resolution: {integrity: sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw==}
     dependencies:
       '@types/hoist-non-react-statics': 3.3.1
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       hoist-non-react-statics: 3.3.2
       redux: 4.1.2
     dev: true
@@ -8024,7 +8024,7 @@ packages:
     resolution: {integrity: sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ==}
     dependencies:
       '@types/history': 4.7.7
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       '@types/react-router': 5.1.8
     dev: true
 
@@ -8038,14 +8038,14 @@ packages:
   /@types/react-transition-group/4.4.4:
     resolution: {integrity: sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==}
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
     dev: true
 
   /@types/react-virtualized/9.21.14:
     resolution: {integrity: sha512-wvZftXXYNpj3ELVm2v8pySnq/uxKD1UsFpRkNoBAbQFTnI4Bz4OcwjUhwvaqUq5dDoT6SCS2+PdCzysxMYfjdg==}
     dependencies:
       '@types/prop-types': 15.7.3
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
     dev: true
 
   /@types/react/17.0.33:
@@ -8062,6 +8062,14 @@ packages:
       '@types/prop-types': 15.7.4
       '@types/scheduler': 0.16.2
       csstype: 3.0.9
+    dev: true
+
+  /@types/react/17.0.36:
+    resolution: {integrity: sha512-CUFUp01OdfbpN/76v4koqgcpcRGT3sYOq3U3N6q0ZVGcyeP40NUdVU+EWe3hs34RNaTefiYyBzOpxBBidCc5zw==}
+    dependencies:
+      '@types/prop-types': 15.7.4
+      '@types/scheduler': 0.16.2
+      csstype: 3.0.9
 
   /@types/redux/3.6.0:
     resolution: {integrity: sha1-8evh5UEVGAcuT9/KXHbhbnTBOZo=}
@@ -19516,7 +19524,7 @@ packages:
       react: 17.0.2
     dev: true
 
-  /react-hot-loader/4.13.0_c8c53a2a5a2c84791ce34d6dbdd05753:
+  /react-hot-loader/4.13.0_597cb904b9c9ac48becb27bac7a6c943:
     resolution: {integrity: sha512-JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA==}
     engines: {node: '>= 6'}
     peerDependencies:
@@ -19527,7 +19535,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 17.0.34
+      '@types/react': 17.0.36
       fast-levenshtein: 2.0.6
       global: 4.4.0
       hoist-non-react-statics: 3.3.2