diff --git a/eslint.config.js b/eslint.config.js
index 94b1802..3196d25 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -53,7 +53,7 @@ export default tseslint.config(
 				}
 			],
 			"comma-spacing": "off",
-    		"@typescript-eslint/comma-spacing": "error",
+    		"@typescript-eslint/comma-spacing": "warn",
 			"@typescript-eslint/no-unused-vars": [
 				"error",
 				{
diff --git a/package-lock.json b/package-lock.json
index d4015c7..f8a466f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,6 +36,7 @@
 			"devDependencies": {
 				"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
 				"@eslint/js": "^9.2.0",
+				"@types/jest": "^29.5.12",
 				"@types/react-syntax-highlighter": "^15.5.13",
 				"@types/webpack-env": "^1.18.4",
 				"@typescript-eslint/eslint-plugin": "^7.8.0",
@@ -44,6 +45,8 @@
 				"eslint-plugin-jsdoc": "^46.4.6",
 				"eslint-plugin-react": "^7.34.1",
 				"gh-pages": "^5.0.0",
+				"jest": "^27.5.1",
+				"ts-jest": "^29.1.2",
 				"typescript": "^4.9.5",
 				"typescript-eslint": "^7.8.0"
 			}
@@ -2780,6 +2783,25 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@jest/console/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/@jest/console/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2890,6 +2912,25 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@jest/core/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/@jest/core/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2916,20 +2957,20 @@
 			}
 		},
 		"node_modules/@jest/expect-utils": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz",
-			"integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+			"integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
 			"dependencies": {
-				"jest-get-type": "^29.4.3"
+				"jest-get-type": "^29.6.3"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/@jest/expect-utils/node_modules/jest-get-type": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-			"integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
@@ -2950,6 +2991,89 @@
 				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
 			}
 		},
+		"node_modules/@jest/fake-timers/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/@jest/fake-timers/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/@jest/globals": {
 			"version": "27.5.1",
 			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
@@ -2963,6 +3087,139 @@
 				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
 			}
 		},
+		"node_modules/@jest/globals/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/@jest/globals/node_modules/diff-sequences": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+			"integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/expect": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+			"integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+			"dependencies": {
+				"@jest/types": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"jest-matcher-utils": "^27.5.1",
+				"jest-message-util": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/jest-diff": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+			"integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/jest-matcher-utils": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+			"integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/@jest/reporters": {
 			"version": "27.5.1",
 			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
@@ -3079,14 +3336,14 @@
 			}
 		},
 		"node_modules/@jest/schemas": {
-			"version": "28.1.3",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
-			"integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
 			"dependencies": {
-				"@sinclair/typebox": "^0.24.1"
+				"@sinclair/typebox": "^0.27.8"
 			},
 			"engines": {
-				"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/@jest/source-map": {
@@ -3567,9 +3824,9 @@
 			"integrity": "sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw=="
 		},
 		"node_modules/@sinclair/typebox": {
-			"version": "0.24.51",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
-			"integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
+			"version": "0.27.8",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
 		},
 		"node_modules/@sinonjs/commons": {
 			"version": "1.8.6",
@@ -3815,104 +4072,6 @@
 				"tslib": "^2.6.0"
 			}
 		},
-		"node_modules/@testing-library/dom": {
-			"version": "9.3.1",
-			"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
-			"integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
-			"peer": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.10.4",
-				"@babel/runtime": "^7.12.5",
-				"@types/aria-query": "^5.0.1",
-				"aria-query": "5.1.3",
-				"chalk": "^4.1.0",
-				"dom-accessibility-api": "^0.5.9",
-				"lz-string": "^1.5.0",
-				"pretty-format": "^27.0.2"
-			},
-			"engines": {
-				"node": ">=14"
-			}
-		},
-		"node_modules/@testing-library/dom/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"peer": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/@testing-library/dom/node_modules/aria-query": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-			"integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
-			"peer": true,
-			"dependencies": {
-				"deep-equal": "^2.0.5"
-			}
-		},
-		"node_modules/@testing-library/dom/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"peer": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/@testing-library/dom/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"peer": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/@testing-library/dom/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"peer": true
-		},
-		"node_modules/@testing-library/dom/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@testing-library/dom/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"peer": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@testing-library/jest-dom": {
 			"version": "5.16.5",
 			"resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz",
@@ -4310,202 +4469,14 @@
 			}
 		},
 		"node_modules/@types/jest": {
-			"version": "29.5.3",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.3.tgz",
-			"integrity": "sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==",
+			"version": "29.5.12",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
+			"integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
 			"dependencies": {
 				"expect": "^29.0.0",
 				"pretty-format": "^29.0.0"
 			}
 		},
-		"node_modules/@types/jest/node_modules/@jest/schemas": {
-			"version": "29.6.0",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
-			"integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
-			"dependencies": {
-				"@sinclair/typebox": "^0.27.8"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/@jest/types": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
-			"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
-			"dependencies": {
-				"@jest/schemas": "^29.6.0",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.8",
-				"chalk": "^4.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/@sinclair/typebox": {
-			"version": "0.27.8",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
-		},
-		"node_modules/@types/jest/node_modules/@types/yargs": {
-			"version": "17.0.24",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-			"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"node_modules/@types/jest/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/@types/jest/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/@types/jest/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-		},
-		"node_modules/@types/jest/node_modules/diff-sequences": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-			"integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/expect": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz",
-			"integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==",
-			"dependencies": {
-				"@jest/expect-utils": "^29.6.1",
-				"@types/node": "*",
-				"jest-get-type": "^29.4.3",
-				"jest-matcher-utils": "^29.6.1",
-				"jest-message-util": "^29.6.1",
-				"jest-util": "^29.6.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@types/jest/node_modules/jest-diff": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz",
-			"integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==",
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^29.4.3",
-				"jest-get-type": "^29.4.3",
-				"pretty-format": "^29.6.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/jest-get-type": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-			"integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/jest-matcher-utils": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz",
-			"integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==",
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^29.6.1",
-				"jest-get-type": "^29.4.3",
-				"pretty-format": "^29.6.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/jest-message-util": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz",
-			"integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==",
-			"dependencies": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^29.6.1",
-				"@types/stack-utils": "^2.0.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.6.1",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@types/jest/node_modules/jest-util": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz",
-			"integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==",
-			"dependencies": {
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
 		"node_modules/@types/jest/node_modules/pretty-format": {
 			"version": "29.6.1",
 			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
@@ -4535,17 +4506,6 @@
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
 			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
 		},
-		"node_modules/@types/jest/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.15",
 			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -6228,6 +6188,18 @@
 				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
 			}
 		},
+		"node_modules/bs-logger": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+			"dev": true,
+			"dependencies": {
+				"fast-json-stable-stringify": "2.x"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
 		"node_modules/bser": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
@@ -7446,11 +7418,11 @@
 			"integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
 		},
 		"node_modules/diff-sequences": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-			"integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/dir-glob": {
@@ -9010,17 +8982,130 @@
 			}
 		},
 		"node_modules/expect": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-			"integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+			"integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
 			"dependencies": {
-				"@jest/types": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"jest-matcher-utils": "^27.5.1",
-				"jest-message-util": "^27.5.1"
+				"@jest/expect-utils": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/@jest/types": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/@types/yargs": {
+			"version": "17.0.32",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+			"integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/expect/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/expect/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/expect/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+		},
+		"node_modules/expect/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/expect/node_modules/jest-get-type": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/jest-util": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.9",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/express": {
@@ -11360,6 +11445,28 @@
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
 		},
+		"node_modules/jest-circus/node_modules/diff-sequences": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+			"integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-circus/node_modules/expect": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+			"integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+			"dependencies": {
+				"@jest/types": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"jest-matcher-utils": "^27.5.1",
+				"jest-message-util": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-circus/node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -11368,6 +11475,53 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-circus/node_modules/jest-diff": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+			"integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-circus/node_modules/jest-matcher-utils": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+			"integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-circus/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-circus/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11583,17 +11737,17 @@
 			}
 		},
 		"node_modules/jest-diff": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-			"integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
 			"dependencies": {
 				"chalk": "^4.0.0",
-				"diff-sequences": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"pretty-format": "^27.5.1"
+				"diff-sequences": "^29.6.3",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/jest-diff/node_modules/ansi-styles": {
@@ -11649,6 +11803,43 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-diff/node_modules/jest-get-type": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-diff/node_modules/pretty-format": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^18.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-diff/node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jest-diff/node_modules/react-is": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+		},
 		"node_modules/jest-diff/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11888,6 +12079,28 @@
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
 		},
+		"node_modules/jest-jasmine2/node_modules/diff-sequences": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+			"integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-jasmine2/node_modules/expect": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+			"integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+			"dependencies": {
+				"@jest/types": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"jest-matcher-utils": "^27.5.1",
+				"jest-message-util": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-jasmine2/node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -11896,6 +12109,53 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-jasmine2/node_modules/jest-diff": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+			"integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-jasmine2/node_modules/jest-matcher-utils": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+			"integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-jasmine2/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-jasmine2/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11920,17 +12180,17 @@
 			}
 		},
 		"node_modules/jest-matcher-utils": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-			"integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
 			"dependencies": {
 				"chalk": "^4.0.0",
-				"jest-diff": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"pretty-format": "^27.5.1"
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/jest-matcher-utils/node_modules/ansi-styles": {
@@ -11986,6 +12246,43 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-matcher-utils/node_modules/jest-get-type": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-matcher-utils/node_modules/pretty-format": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^18.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-matcher-utils/node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jest-matcher-utils/node_modules/react-is": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+		},
 		"node_modules/jest-matcher-utils/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11998,22 +12295,46 @@
 			}
 		},
 		"node_modules/jest-message-util": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
 			"dependencies": {
 				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^27.5.1",
+				"@jest/types": "^29.6.3",
 				"@types/stack-utils": "^2.0.0",
 				"chalk": "^4.0.0",
 				"graceful-fs": "^4.2.9",
 				"micromatch": "^4.0.4",
-				"pretty-format": "^27.5.1",
+				"pretty-format": "^29.7.0",
 				"slash": "^3.0.0",
 				"stack-utils": "^2.0.3"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-message-util/node_modules/@jest/types": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-message-util/node_modules/@types/yargs": {
+			"version": "17.0.32",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+			"integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+			"dependencies": {
+				"@types/yargs-parser": "*"
 			}
 		},
 		"node_modules/jest-message-util/node_modules/ansi-styles": {
@@ -12069,6 +12390,35 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-message-util/node_modules/pretty-format": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^18.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-message-util/node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jest-message-util/node_modules/react-is": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+		},
 		"node_modules/jest-message-util/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12297,6 +12647,25 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-runner/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-runner/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12393,6 +12762,25 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-runtime/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-runtime/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12493,6 +12881,28 @@
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
 		},
+		"node_modules/jest-snapshot/node_modules/diff-sequences": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+			"integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/expect": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+			"integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+			"dependencies": {
+				"@jest/types": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"jest-matcher-utils": "^27.5.1",
+				"jest-message-util": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-snapshot/node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -12501,6 +12911,53 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-snapshot/node_modules/jest-diff": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+			"integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/jest-matcher-utils": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+			"integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.5.1",
+				"jest-get-type": "^27.5.1",
+				"pretty-format": "^27.5.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/jest-message-util": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.5.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.5.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+			}
+		},
 		"node_modules/jest-snapshot/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12716,6 +13173,17 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jest-watch-typeahead/node_modules/@jest/schemas": {
+			"version": "28.1.3",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
+			"integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+			"dependencies": {
+				"@sinclair/typebox": "^0.24.1"
+			},
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+			}
+		},
 		"node_modules/jest-watch-typeahead/node_modules/@jest/test-result": {
 			"version": "28.1.3",
 			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
@@ -12746,6 +13214,11 @@
 				"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
 			}
 		},
+		"node_modules/jest-watch-typeahead/node_modules/@sinclair/typebox": {
+			"version": "0.24.51",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
+			"integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
+		},
 		"node_modules/jest-watch-typeahead/node_modules/@types/yargs": {
 			"version": "17.0.32",
 			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
@@ -13538,6 +14011,12 @@
 				"semver": "bin/semver"
 			}
 		},
+		"node_modules/make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true
+		},
 		"node_modules/makeerror": {
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -18225,6 +18704,171 @@
 			"resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
 			"integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
 		},
+		"node_modules/ts-jest": {
+			"version": "29.1.2",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
+			"integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==",
+			"dev": true,
+			"dependencies": {
+				"bs-logger": "0.x",
+				"fast-json-stable-stringify": "2.x",
+				"jest-util": "^29.0.0",
+				"json5": "^2.2.3",
+				"lodash.memoize": "4.x",
+				"make-error": "1.x",
+				"semver": "^7.5.3",
+				"yargs-parser": "^21.0.1"
+			},
+			"bin": {
+				"ts-jest": "cli.js"
+			},
+			"engines": {
+				"node": "^16.10.0 || ^18.0.0 || >=20.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.0.0-beta.0 <8",
+				"@jest/types": "^29.0.0",
+				"babel-jest": "^29.0.0",
+				"jest": "^29.0.0",
+				"typescript": ">=4.3 <6"
+			},
+			"peerDependenciesMeta": {
+				"@babel/core": {
+					"optional": true
+				},
+				"@jest/types": {
+					"optional": true
+				},
+				"babel-jest": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ts-jest/node_modules/@jest/types": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/ts-jest/node_modules/@types/yargs": {
+			"version": "17.0.32",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+			"integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+			"dev": true,
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/ts-jest/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/ts-jest/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/ts-jest/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/ts-jest/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/ts-jest/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ts-jest/node_modules/jest-util": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.9",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/ts-jest/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ts-jest/node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/tsconfig-paths": {
 			"version": "3.15.0",
 			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -18402,6 +19046,7 @@
 			"version": "4.9.5",
 			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
 			"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+			"dev": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
diff --git a/package.json b/package.json
index 1f8c1e6..4125d8f 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
 		"start": "react-scripts start",
 		"build": "react-scripts build",
 		"test": "react-scripts test",
-		"eject": "react-scripts eject",
 		"predeploy": "npm run build",
 		"deploy": "sh deploy.sh"
 	},
@@ -43,6 +42,7 @@
 	"devDependencies": {
 		"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
 		"@eslint/js": "^9.2.0",
+		"@types/jest": "^29.5.12",
 		"@types/react-syntax-highlighter": "^15.5.13",
 		"@types/webpack-env": "^1.18.4",
 		"@typescript-eslint/eslint-plugin": "^7.8.0",
@@ -51,6 +51,8 @@
 		"eslint-plugin-jsdoc": "^46.4.6",
 		"eslint-plugin-react": "^7.34.1",
 		"gh-pages": "^5.0.0",
+		"jest": "^27.5.1",
+		"ts-jest": "^29.1.2",
 		"typescript": "^4.9.5",
 		"typescript-eslint": "^7.8.0"
 	},
diff --git a/public/config/theme.xml b/public/config/theme.xml
new file mode 100644
index 0000000..0aad8e2
--- /dev/null
+++ b/public/config/theme.xml
@@ -0,0 +1,3 @@
+<options>
+	<theme>0</theme>
+</options>
\ No newline at end of file
diff --git a/src/App.module.css b/src/App.module.css
index 9b79409..99a0ee0 100644
--- a/src/App.module.css
+++ b/src/App.module.css
@@ -11,4 +11,4 @@
 
 .App > * {
 	pointer-events: auto;
-}
+}
\ No newline at end of file
diff --git a/src/App.tsx b/src/App.tsx
index 3a1c720..cd16d3d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -6,11 +6,12 @@ import { VirtualRootProvider } from "./hooks/virtual-drive/virtualRootContext";
 import { Desktop } from "./components/desktop/Desktop";
 import { SettingsManagerProvider } from "./hooks/settings/settingsManagerContext";
 import { ModalsView } from "./components/modals/ModalsView";
-import { FC, useEffect } from "react";
+import { ReactElement, useEffect } from "react";
 import { ZIndexManagerProvider } from "./hooks/z-index/zIndexManagerContext";
 import { ModalsManagerProvider } from "./hooks/modals/modalsManagerContext";
+import { ThemeProvider } from "./hooks/themes/themes";
 
-const App: FC = () => {
+export default function App(): ReactElement {
 	useEffect(() => {
 		const onContextMenu = (event: Event) => {
 			event.preventDefault();
@@ -29,18 +30,18 @@ const App: FC = () => {
 				<WindowsManagerProvider>
 					<ModalsManagerProvider>
 						<SettingsManagerProvider>
-							<div className={styles.App}>
-								<Taskbar/>
-								<WindowsView/>
-								<ModalsView/>
-								<Desktop/>
-							</div>
+							<ThemeProvider>
+								<div className={styles.App}>
+									<Taskbar/>
+									<WindowsView/>
+									<ModalsView/>
+									<Desktop/>
+								</div>
+							</ThemeProvider>
 						</SettingsManagerProvider>
 					</ModalsManagerProvider>
 				</WindowsManagerProvider>
 			</ZIndexManagerProvider>
 		</VirtualRootProvider>
 	);
-};
-
-export default App;
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/components/apps/settings/Settings.module.css b/src/components/apps/settings/Settings.module.css
index 6c98f0e..bb90467 100644
--- a/src/components/apps/settings/Settings.module.css
+++ b/src/components/apps/settings/Settings.module.css
@@ -154,7 +154,7 @@
 }
 
 .Button-red {
-	--text-color: var(--background-color-a) !important;
+	--text-color: var(--dark-grey-b) !important;
 	--normal-color: var(--red-a) !important;
 	--hover-color: var(--red-b) !important;
 }
@@ -241,4 +241,26 @@
 	width: inherit;
 	height: inherit;
 	object-fit: contain;
+}
+
+.Dropdown {
+	width: auto;
+	max-width: calc(60% - var(--gap));
+	padding: 0.5rem 1rem;
+	color: var(--text-color);
+	background-color: var(--background-color-a);
+	border: none;
+	border-radius: 0.5rem;
+	outline: none;
+	font-size: 0.875em;
+}
+
+.Dropdown > * {
+	color: inherit;
+	background-color: inherit;
+	border: none;
+	border-radius: 0.5rem;
+	outline: none;
+	font-family: inherit;
+	font-size: inherit;
 }
\ No newline at end of file
diff --git a/src/components/apps/settings/Settings.tsx b/src/components/apps/settings/Settings.tsx
index 1d2e464..fa0a40c 100644
--- a/src/components/apps/settings/Settings.tsx
+++ b/src/components/apps/settings/Settings.tsx
@@ -9,6 +9,13 @@ import { StorageTab } from "./tabs/StorageSettings";
 import { AppsSettings } from "./tabs/AppsSettings";
 import { WindowProps } from "../../windows/WindowView";
 
+export const TABS = {
+	APPS: 0,
+	APPEARANCE: 1,
+	STORAGE: 2,
+	ABOUT: 3,
+};
+
 interface SettingsProps extends WindowProps {
 	tab?: number;
 }
diff --git a/src/components/apps/settings/tabs/AppearanceSettings.tsx b/src/components/apps/settings/tabs/AppearanceSettings.tsx
index 8b696e0..22c44b1 100644
--- a/src/components/apps/settings/tabs/AppearanceSettings.tsx
+++ b/src/components/apps/settings/tabs/AppearanceSettings.tsx
@@ -13,24 +13,43 @@ import { DEFAULT_FILE_SELECTOR_SIZE } from "../../../../config/modals.config";
 import { IMAGE_FORMATS } from "../../../../config/apps/mediaViewer.config";
 import { VirtualFile } from "../../../../features/virtual-drive/file/virtualFile";
 import { VirtualFolder } from "../../../../features/virtual-drive/folder/virtualFolder";
+import { THEMES } from "../../../../hooks/themes/themes";
 
 export function AppearanceSettings() {
 	const virtualRoot = useVirtualRoot();
 	const settingsManager = useSettingsManager();
+	const [theme, setTheme] = useState(0);
 	const [wallpaper, setWallpaper] = useState<string>(null);
-	const settings = settingsManager.get(SettingsManager.VIRTUAL_PATHS.desktop);
+	const desktopSettings = settingsManager.get(SettingsManager.VIRTUAL_PATHS.desktop);
+	const themeSettings = settingsManager.get(SettingsManager.VIRTUAL_PATHS.theme);
 	const { openWindowedModal } = useWindowedModal();
 
 	useEffect(() => {
-		void settings.get("wallpaper", setWallpaper);
-	}, [settings]);
+		void desktopSettings.get("wallpaper", setWallpaper);
+		void themeSettings.get("theme", (value: string) => { setTheme(parseInt(value)); });
+	}, [desktopSettings, themeSettings]);
 
-	const onChange = (event: Event) => {
+	const onWallpaperChange = (event: Event) => {
 		const value = (event.target as HTMLInputElement).value;
-		void settings.set("wallpaper", value);
+		void desktopSettings.set("wallpaper", value);
+	};
+
+	const onThemeChange = (event: Event) => {
+		const value = (event.target as HTMLInputElement).value;
+		void themeSettings.set("theme", value);
 	};
 
 	return (<>
+		<div className={styles["Option"]}>
+			<p className={styles["Label"]}>Theme</p>
+			<div className={styles["Input"]}>
+				<select className={styles["Dropdown"]} aria-label="theme" value={theme} onChange={onThemeChange as unknown as ChangeEventHandler}>
+					{Object.entries(THEMES).map(([key, value]) =>
+						<option key={key} value={key}>{value}</option>
+					)}
+				</select>
+			</div>
+		</div>
 		<div className={styles["Option"]}>
 			<p className={styles["Label"]}>Wallpaper</p>
 			<Button
@@ -42,7 +61,7 @@ export function AppearanceSettings() {
 							type={SELECTOR_MODE.SINGLE}
 							allowedFormats={IMAGE_FORMATS}
 							onFinish={(file: VirtualFile) => {
-								void settings.set("wallpaper", file.source);
+								void desktopSettings.set("wallpaper", file.source);
 							}}
 							{...props}
 						/>
@@ -59,7 +78,7 @@ export function AppearanceSettings() {
 							value={source}
 							aria-label="Wallpaper image"
 							checked={source === wallpaper}
-							onChange={onChange as unknown as ChangeEventHandler}
+							onChange={onWallpaperChange as unknown as ChangeEventHandler}
 							tabIndex={0}
 						/>
 						<img src={source} alt={id} draggable="false"/>
diff --git a/src/components/desktop/Desktop.module.css b/src/components/desktop/Desktop.module.css
index 1831f7e..405fcbd 100644
--- a/src/components/desktop/Desktop.module.css
+++ b/src/components/desktop/Desktop.module.css
@@ -38,6 +38,10 @@
 	text-shadow: 0.1rem 0.1rem 0.2rem hsla(var(--background-color-a-hsl), 75%);
 }
 
+.Item p {
+	color: var(--white-a);
+}
+
 .Item svg {
 	filter: drop-shadow(0.1rem 0.1rem 0.2rem hsla(var(--background-color-a-hsl), 50%));
 }
\ No newline at end of file
diff --git a/src/components/desktop/Desktop.tsx b/src/components/desktop/Desktop.tsx
index 3c6c2fa..705a955 100644
--- a/src/components/desktop/Desktop.tsx
+++ b/src/components/desktop/Desktop.tsx
@@ -25,6 +25,7 @@ import ModalsManager from "../../features/modals/modalsManager";
 import { VirtualFolder } from "../../features/virtual-drive/folder/virtualFolder";
 import { VirtualFolderLink } from "../../features/virtual-drive/folder/virtualFolderLink";
 import { VirtualFile } from "../../features/virtual-drive/file/virtualFile";
+import { TABS } from "../apps/settings/Settings";
 
 export const Desktop = memo(() => {
 	const settingsManager = useSettingsManager();
@@ -58,7 +59,7 @@ export const Desktop = memo(() => {
 				reloadViewport();
 			}}/>
 			<ClickAction label="Change appearance" icon={faPaintBrush} onTrigger={() => {
-				windowsManager.open("settings", { tab: 0 });
+				windowsManager.open("settings", { tab: TABS.APPEARANCE });
 			}}/>
 			<Divider/>
 			<ClickAction label={`Open in ${APP_NAMES.FILE_EXPLORER}`} icon={APP_ICONS.FILE_EXPLORER} onTrigger={() => {
diff --git a/src/components/taskbar/menus/HomeMenu.module.css b/src/components/taskbar/menus/HomeMenu.module.css
index abd7137..bf44a3b 100644
--- a/src/components/taskbar/menus/HomeMenu.module.css
+++ b/src/components/taskbar/menus/HomeMenu.module.css
@@ -11,7 +11,7 @@
 	display: flex;
 	min-width: 16rem;
 	max-width: 32rem;
-	background-color: rgba(25, 25, 25, 75%);
+	background-color: hsla(var(--background-color-c-hsl), 75%);
 	border-top-left-radius: 0.5rem;
 	border-top-right-radius: 0.5rem;
 	border-bottom-right-radius: 0.5rem;
diff --git a/src/components/taskbar/menus/SearchMenu.module.css b/src/components/taskbar/menus/SearchMenu.module.css
index 968a0ce..2ee0a22 100644
--- a/src/components/taskbar/menus/SearchMenu.module.css
+++ b/src/components/taskbar/menus/SearchMenu.module.css
@@ -17,7 +17,7 @@
 	min-width: 13rem;
 	max-width: 19rem;
 	padding: 0.5rem;
-	background-color: rgba(25, 25, 25, 75%);
+	background-color: hsla(var(--background-color-c-hsl), 75%);
 	border-top-left-radius: 0.5rem;
 	border-top-right-radius: 0.5rem;
 	border-bottom-right-radius: 0.5rem;
diff --git a/src/components/taskbar/menus/UtilMenu.module.css b/src/components/taskbar/menus/UtilMenu.module.css
index 1a9af39..8d7f579 100644
--- a/src/components/taskbar/menus/UtilMenu.module.css
+++ b/src/components/taskbar/menus/UtilMenu.module.css
@@ -9,7 +9,7 @@
 .Container-inner {
 	opacity: 1;
 	display: flex;
-	background-color: rgba(25, 25, 25, 75%);
+	background-color: hsla(var(--background-color-c-hsl), 75%);
 	border-top-left-radius: 0.5rem;
 	border-top-right-radius: 0.5rem;
 	border-bottom-left-radius: 0.5rem;
diff --git a/src/features/_utils/browser.utils.ts b/src/features/_utils/browser.utils.ts
index 6ef637c..14fea6e 100644
--- a/src/features/_utils/browser.utils.ts
+++ b/src/features/_utils/browser.utils.ts
@@ -62,7 +62,7 @@ export function generateUrl(options: { appId: string; fullscreen: boolean; }) {
 		return baseUrl;
 
 	const { appId, fullscreen, ...extraOptions } = options;
-	const params = new URLSearchParams();
+	const params: URLSearchParams & { size?: number } = new URLSearchParams();
 
 	if (appId)
 		params.set("app", appId);
diff --git a/src/features/settings/settingsManager.ts b/src/features/settings/settingsManager.ts
index 6f34b5d..7121cd1 100644
--- a/src/features/settings/settingsManager.ts
+++ b/src/features/settings/settingsManager.ts
@@ -6,6 +6,7 @@ export class SettingsManager {
 		desktop: "~/.config/desktop.xml",
 		taskbar: "~/.config/taskbar.xml",
 		apps: "~/.config/apps.xml",
+		theme: "~/.config/theme.xml"
 	};
 
 	#pathToSettings: { [s: string]: Settings; } = {};
diff --git a/src/features/virtual-drive/root/defaultData.ts b/src/features/virtual-drive/root/defaultData.ts
index 1739098..cc34a5d 100644
--- a/src/features/virtual-drive/root/defaultData.ts
+++ b/src/features/virtual-drive/root/defaultData.ts
@@ -21,6 +21,8 @@ export function loadDefaultData(virtualRoot: VirtualRoot) {
 						file.setSource("/config/taskbar.xml");
 					}).createFile("apps", "xml", (file) => {
 						file.setSource("/config/apps.xml");
+					}).createFile("theme", "xml", (file) => {
+						file.setSource("/config/apps.xml");
 					});
 				})
 				.createFolder("Pictures", (folder) => {
@@ -131,6 +133,8 @@ export function loadDefaultData(virtualRoot: VirtualRoot) {
 				file.setSource(`${process.env.PUBLIC_URL}/config/desktop.xml`);
 			}).createFile("taskbar", "xml", (file) => {
 				file.setSource(`${process.env.PUBLIC_URL}/config/taskbar.xml`);
+			}).createFile("theme", "xml", (file) => {
+				file.setSource(`${process.env.PUBLIC_URL}/config/theme.xml`);
 			});
 		}).createFolder("documents", (folder) => {
 			folder.createFile("info", "md", (file) => {
diff --git a/src/hooks/themes/themes.tsx b/src/hooks/themes/themes.tsx
new file mode 100644
index 0000000..151af94
--- /dev/null
+++ b/src/hooks/themes/themes.tsx
@@ -0,0 +1,31 @@
+import { ReactElement, useEffect, useState } from "react";
+import { useSettingsManager } from "../settings/settingsManagerContext";
+import { SettingsManager } from "../../features/settings/settingsManager";
+
+export const THEMES = {
+	0: "Dark",
+	1: "Light",
+	4: "Muted",
+	2: "Cherry",
+	3: "Mango",
+	5: "Aqua",
+	6: "Grape"
+};
+
+interface ThemeProviderProps {
+	children: ReactElement;
+}
+
+export function ThemeProvider({ children }: ThemeProviderProps): ReactElement {
+	const [theme, setTheme] = useState(0);
+	const settingsManager = useSettingsManager();
+	const themeSettings = settingsManager.get(SettingsManager.VIRTUAL_PATHS.theme);
+
+	useEffect(() => {
+		void themeSettings.get("theme", (value: string) => { setTheme(parseInt(value)); });
+	}, [themeSettings]);
+
+	return <div className={`${THEMES[theme]}-theme`}>
+		{children}
+	</div>;
+} 
\ No newline at end of file
diff --git a/src/styles/global.css b/src/styles/global.css
index 1182bb2..d27ccd5 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -1,5 +1,6 @@
 @import "./global/variables.css";
 @import "./global/fonts.css";
+@import "./global/themes.css";
 @import "./global/scrollbar.css";
 
 html, body, #root {
diff --git a/src/styles/global/themes.css b/src/styles/global/themes.css
new file mode 100644
index 0000000..b5ed514
--- /dev/null
+++ b/src/styles/global/themes.css
@@ -0,0 +1,70 @@
+.Light-theme {
+	--foreground-color-a: var(--dark-grey-ca);
+	--foreground-color-b: var(--dark-grey-c);	
+	--foreground-color-c: var(--dark-grey-b);
+
+	--background-color-a: var(--grey-aa);
+	--background-color-b: var(--grey-a);
+	--background-color-ba: var(--white-b);
+	--background-color-c: var(--white-a);
+	--background-color-d: var(--white-b);
+
+	--taskbar-color: rgba(255, 255, 255, 25%);
+	--background-color-c-hsl: 210, 45%, 90%;
+}
+
+.Cherry-theme, .Mango-theme, .Muted-theme, .Aqua-theme, .Grape-theme {
+	--hue: 0;
+	--saturation: 1;
+	--lightness: 1;
+
+	--white-a: hsl(var(--hue), calc(54% * var(--saturation)), calc(95% * var(--lightness)));
+	--white-b: hsl(var(--hue), calc(45% * var(--saturation)), calc(90% * var(--lightness)));
+	--grey-a: hsl(var(--hue), calc(36% * var(--saturation)), calc(85% * var(--lightness)));
+	--grey-aa: hsl(var(--hue), calc(27% * var(--saturation)), calc(72.5% * var(--lightness)));
+	--grey-b: hsl(var(--hue), calc(18% * var(--saturation)), calc(60% * var(--lightness)));
+	--dark-grey-a: hsl(var(--hue), calc(14% * var(--saturation)), calc(40% * var(--lightness)));
+	--dark-grey-b: hsl(var(--hue), calc(29% * var(--saturation)), calc(19% * var(--lightness)));
+	--dark-grey-c: hsl(var(--hue), calc(29% * var(--saturation)), calc(15% * var(--lightness)));
+	--dark-grey-ca: hsl(var(--hue), calc(27% * var(--saturation)), calc(12% * var(--lightness)));
+	--dark-grey-d: hsl(var(--hue), calc(14% * var(--saturation)), calc(10% * var(--lightness)));
+	--dark-grey-e: hsl(var(--hue), calc(12% * var(--saturation)), calc(8% * var(--lightness)));
+
+	--foreground-color-a: var(--white-a);
+	--foreground-color-b: var(--grey-a);
+	--foreground-color-c: var(--grey-b);
+
+	--background-color-a: var(--dark-grey-b);
+	--background-color-b: var(--dark-grey-c);
+	--background-color-ba: var(--dark-grey-ca);
+	--background-color-c: var(--dark-grey-d);
+	--background-color-d: var(--dark-grey-e);
+}
+
+.Cherry-theme {
+	--hue: 0;
+	--saturation: 5;
+	--lightness: 1.5;
+}
+
+.Mango-theme {
+	--hue: 40;
+	--saturation: 5;
+	--lightness: 2.5;
+}
+
+.Muted-theme {
+	--saturation: 0;
+}
+
+.Aqua-theme {
+	--hue: 180;
+	--saturation: 4;
+	--lightness: 2;
+}
+
+.Grape-theme {
+	--hue: 310;
+	--saturation: 5;
+	--lightness: 1.5;
+}
\ No newline at end of file
diff --git a/src/styles/global/variables.css b/src/styles/global/variables.css
index 8f3bd8a..8b7a92e 100644
--- a/src/styles/global/variables.css
+++ b/src/styles/global/variables.css
@@ -1,5 +1,6 @@
 :root {
 	--white-a: hsl(210, 54%, 95%);
+	--white-b: hsl(210, 45%, 90%);
 	--pink-a: #ff9ff3;
 	--pink-b: #f368e0;
 	--yellow-a: #feca57;
@@ -17,10 +18,11 @@
 	--purple-a: #5f27cd;
 	--purple-b: #341f97;
 	--grey-a: hsl(210, 36%, 85%);
+	--grey-aa: hsl(210, 27%, 72.5%);
 	--grey-b: hsl(210, 18%, 60%);
-	--dark-grey-a: hsl(211, 14%, 40%);
-	--dark-grey-b: hsl(var(--background-color-a-hsl));
-	--dark-grey-c: hsl(var(--background-color-c-hsl));
+	--dark-grey-a: hsl(212, 14%, 40%);
+	--dark-grey-b: hsl(212, 29%, 19%);
+	--dark-grey-c: hsl(212, 29%, 15%);
 	--dark-grey-ca: hsl(212, 27%, 12%);
 	--dark-grey-d: hsl(212, 14%, 10%);
 	--dark-grey-e: hsl(212, 12%, 8%);
@@ -29,13 +31,13 @@
 	--foreground-color-b: var(--grey-a);
 	--foreground-color-c: var(--grey-b);
 
-	--background-color-a: var(--dark-grey-b);
-	--background-color-b: var(--dark-grey-c);
+	--background-color-a: hsl(var(--background-color-a-hsl));
+	--background-color-b: hsl(var(--background-color-c-hsl));
 	--background-color-ba: var(--dark-grey-ca);
 	--background-color-c: var(--dark-grey-d);
 	--background-color-d: var(--dark-grey-e);
 
-	--background-color-a-hsl: 212, 29%, 19%;
+	--background-color-a-hsl: 212, 29%, 19%; 
 	--background-color-c-hsl: 212, 29%, 15%;
 
 	--scrollbar-color: hsla(211, 29%, 40%, 25%);