diff --git a/package-lock.json b/package-lock.json
index 87e0d6b5..ad638d8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
 				"@babel/preset-env": "^7.16.4",
 				"@babel/preset-react": "^7.16.0",
 				"@hot-loader/react-dom": "^17.0.1",
-				"babel-loader": "^8.2.3",
+				"babel-loader": "^8.3.0",
 				"chart.js": "^3.6.2",
 				"chartjs-plugin-annotation": "^1.2.2",
 				"classnames": "^2.3.1",
@@ -40,7 +40,7 @@
 				"react-chartjs-2": "^4.0.0",
 				"react-devtools": "^4.21.0",
 				"react-dom": "17.0.1",
-				"react-hot-loader": "^4.13.0",
+				"react-hot-loader": "^4.13.1",
 				"react-qr-reader": "^3.0.0-beta-1",
 				"react-router-dom": "^5.3.0",
 				"style-loader": "^3.3.1",
@@ -2546,13 +2546,13 @@
 			}
 		},
 		"node_modules/babel-loader": {
-			"version": "8.2.3",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-			"integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
 			"dev": true,
 			"dependencies": {
 				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^1.4.0",
+				"loader-utils": "^2.0.0",
 				"make-dir": "^3.1.0",
 				"schema-utils": "^2.6.5"
 			},
@@ -6379,13 +6379,10 @@
 			"optional": true
 		},
 		"node_modules/json5": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
 			"dev": true,
-			"dependencies": {
-				"minimist": "^1.2.5"
-			},
 			"bin": {
 				"json5": "lib/cli.js"
 			},
@@ -6572,29 +6569,17 @@
 			}
 		},
 		"node_modules/loader-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
 			"dev": true,
 			"dependencies": {
 				"big.js": "^5.2.2",
 				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
+				"json5": "^2.1.2"
 			},
 			"engines": {
-				"node": ">=4.0.0"
-			}
-		},
-		"node_modules/loader-utils/node_modules/json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-			"dev": true,
-			"dependencies": {
-				"minimist": "^1.2.0"
-			},
-			"bin": {
-				"json5": "lib/cli.js"
+				"node": ">=8.9.0"
 			}
 		},
 		"node_modules/locate-path": {
@@ -8607,15 +8592,15 @@
 			}
 		},
 		"node_modules/react-hot-loader": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz",
-			"integrity": "sha512-JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA==",
+			"version": "4.13.1",
+			"resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.1.tgz",
+			"integrity": "sha512-ZlqCfVRqDJmMXTulUGic4lN7Ic1SXgHAFw7y/Jb7t25GBgTR0fYAJ8uY4mrpxjRyWGWmqw77qJQGnYbzCvBU7g==",
 			"dev": true,
 			"dependencies": {
 				"fast-levenshtein": "^2.0.6",
 				"global": "^4.3.0",
 				"hoist-non-react-statics": "^3.3.0",
-				"loader-utils": "^1.1.0",
+				"loader-utils": "^2.0.3",
 				"prop-types": "^15.6.1",
 				"react-lifecycles-compat": "^3.0.4",
 				"shallowequal": "^1.1.0",
@@ -8625,9 +8610,9 @@
 				"node": ">= 6"
 			},
 			"peerDependencies": {
-				"@types/react": "^15.0.0 || ^16.0.0 || ^17.0.0 ",
-				"react": "^15.0.0 || ^16.0.0 || ^17.0.0 ",
-				"react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 "
+				"@types/react": "^15.0.0 || ^16.0.0 || ^17.0.0",
+				"react": "^15.0.0 || ^16.0.0 || ^17.0.0",
+				"react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0"
 			},
 			"peerDependenciesMeta": {
 				"@types/react": {
@@ -12850,13 +12835,13 @@
 			}
 		},
 		"babel-loader": {
-			"version": "8.2.3",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-			"integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
 			"dev": true,
 			"requires": {
 				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^1.4.0",
+				"loader-utils": "^2.0.0",
 				"make-dir": "^3.1.0",
 				"schema-utils": "^2.6.5"
 			}
@@ -15774,13 +15759,10 @@
 			"optional": true
 		},
 		"json5": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.5"
-			}
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+			"dev": true
 		},
 		"jsonfile": {
 			"version": "4.0.0",
@@ -15914,25 +15896,14 @@
 			"dev": true
 		},
 		"loader-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
 			"dev": true,
 			"requires": {
 				"big.js": "^5.2.2",
 				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
-			},
-			"dependencies": {
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				}
+				"json5": "^2.1.2"
 			}
 		},
 		"locate-path": {
@@ -17413,15 +17384,15 @@
 			}
 		},
 		"react-hot-loader": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz",
-			"integrity": "sha512-JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA==",
+			"version": "4.13.1",
+			"resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.1.tgz",
+			"integrity": "sha512-ZlqCfVRqDJmMXTulUGic4lN7Ic1SXgHAFw7y/Jb7t25GBgTR0fYAJ8uY4mrpxjRyWGWmqw77qJQGnYbzCvBU7g==",
 			"dev": true,
 			"requires": {
 				"fast-levenshtein": "^2.0.6",
 				"global": "^4.3.0",
 				"hoist-non-react-statics": "^3.3.0",
-				"loader-utils": "^1.1.0",
+				"loader-utils": "^2.0.3",
 				"prop-types": "^15.6.1",
 				"react-lifecycles-compat": "^3.0.4",
 				"shallowequal": "^1.1.0",
diff --git a/package.json b/package.json
index d5436491..deb0230e 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
 		"@babel/preset-env": "^7.16.4",
 		"@babel/preset-react": "^7.16.0",
 		"@hot-loader/react-dom": "^17.0.1",
-		"babel-loader": "^8.2.3",
+		"babel-loader": "^8.3.0",
 		"chart.js": "^3.6.2",
 		"chartjs-plugin-annotation": "^1.2.2",
 		"classnames": "^2.3.1",
@@ -49,7 +49,7 @@
 		"react-chartjs-2": "^4.0.0",
 		"react-devtools": "^4.21.0",
 		"react-dom": "17.0.1",
-		"react-hot-loader": "^4.13.0",
+		"react-hot-loader": "^4.13.1",
 		"react-qr-reader": "^3.0.0-beta-1",
 		"react-router-dom": "^5.3.0",
 		"style-loader": "^3.3.1",