diff --git a/package.json b/package.json
index 9cba499e..ade75371 100644
--- a/package.json
+++ b/package.json
@@ -23,17 +23,17 @@
     "@emeraldpay/hashicon-react": "^0.5.2",
     "@meshtastic/eslint-config": "^1.0.6",
     "@meshtastic/meshtasticjs": "^0.6.48",
-    "@reduxjs/toolkit": "^1.7.2",
+    "@reduxjs/toolkit": "^1.8.0",
     "@tippyjs/react": "^4.2.6",
     "base64-js": "^1.5.1",
-    "framer-motion": "^6.2.7",
+    "framer-motion": "^6.2.8",
     "mapbox-gl": "^2.7.0",
     "prettier": "^2.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-draggable": "^4.4.4",
     "react-error-boundary": "^3.1.4",
-    "react-flow-renderer": "^10.0.0-next.39",
+    "react-flow-renderer": "^10.0.0-next.45",
     "react-hook-form": "^7.27.1",
     "react-icons": "^4.3.1",
     "react-json-pretty": "^2.2.0",
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@hookform/devtools": "^4.0.2",
-    "@types/mapbox-gl": "^2.6.1",
+    "@types/mapbox-gl": "^2.6.2",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
     "@types/w3c-web-serial": "^1.0.2",
@@ -57,15 +57,15 @@
     "@vitejs/plugin-react": "^1.2.0",
     "autoprefixer": "^10.4.2",
     "gzipper": "^7.0.0",
-    "postcss": "^8.4.6",
-    "rollup-plugin-visualizer": "^5.5.4",
+    "postcss": "^8.4.7",
+    "rollup-plugin-visualizer": "^5.6.0",
     "tailwindcss": "^3.0.23",
     "tar": "^6.1.11",
-    "typescript": "^4.5.5",
+    "typescript": "^4.6.2",
     "unimported": "^1.19.1",
-    "vite": "^2.8.4",
+    "vite": "^2.8.5",
     "vite-plugin-cdn-import": "^0.3.5",
     "vite-plugin-pwa": "^0.11.13",
-    "workbox-window": "^6.4.2"
+    "workbox-window": "^6.5.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index add54fc5..f3087369 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,9 +5,9 @@ specifiers:
   '@hookform/devtools': ^4.0.2
   '@meshtastic/eslint-config': ^1.0.6
   '@meshtastic/meshtasticjs': ^0.6.48
-  '@reduxjs/toolkit': ^1.7.2
+  '@reduxjs/toolkit': ^1.8.0
   '@tippyjs/react': ^4.2.6
-  '@types/mapbox-gl': ^2.6.1
+  '@types/mapbox-gl': ^2.6.2
   '@types/react': ^17.0.39
   '@types/react-dom': ^17.0.11
   '@types/w3c-web-serial': ^1.0.2
@@ -15,16 +15,16 @@ specifiers:
   '@vitejs/plugin-react': ^1.2.0
   autoprefixer: ^10.4.2
   base64-js: ^1.5.1
-  framer-motion: ^6.2.7
+  framer-motion: ^6.2.8
   gzipper: ^7.0.0
   mapbox-gl: ^2.7.0
-  postcss: ^8.4.6
+  postcss: ^8.4.7
   prettier: ^2.5.1
   react: ^17.0.2
   react-dom: ^17.0.2
   react-draggable: ^4.4.4
   react-error-boundary: ^3.1.4
-  react-flow-renderer: ^10.0.0-next.39
+  react-flow-renderer: ^10.0.0-next.45
   react-hook-form: ^7.27.1
   react-icons: ^4.3.1
   react-json-pretty: ^2.2.0
@@ -32,36 +32,36 @@ specifiers:
   react-redux: ^7.2.6
   react-use-clipboard: ^1.0.7
   rfc4648: ^1.5.1
-  rollup-plugin-visualizer: ^5.5.4
+  rollup-plugin-visualizer: ^5.6.0
   swr: ^1.2.2
   tailwindcss: ^3.0.23
   tar: ^6.1.11
   timeago-react: ^3.0.4
   tippy.js: ^6.3.7
   type-route: ^0.6.0
-  typescript: ^4.5.5
+  typescript: ^4.6.2
   unimported: ^1.19.1
-  vite: ^2.8.4
+  vite: ^2.8.5
   vite-plugin-cdn-import: ^0.3.5
   vite-plugin-environment: ^1.1.0
   vite-plugin-pwa: ^0.11.13
-  workbox-window: ^6.4.2
+  workbox-window: ^6.5.0
 
 dependencies:
   '@emeraldpay/hashicon-react': 0.5.2
   '@meshtastic/eslint-config': 1.0.6
   '@meshtastic/meshtasticjs': 0.6.48
-  '@reduxjs/toolkit': 1.7.2_react-redux@7.2.6+react@17.0.2
+  '@reduxjs/toolkit': 1.8.0_react-redux@7.2.6+react@17.0.2
   '@tippyjs/react': 4.2.6_react-dom@17.0.2+react@17.0.2
   base64-js: 1.5.1
-  framer-motion: 6.2.7_react-dom@17.0.2+react@17.0.2
+  framer-motion: 6.2.8_react-dom@17.0.2+react@17.0.2
   mapbox-gl: 2.7.0
   prettier: 2.5.1
   react: 17.0.2
   react-dom: 17.0.2_react@17.0.2
   react-draggable: 4.4.4_react-dom@17.0.2+react@17.0.2
   react-error-boundary: 3.1.4_react@17.0.2
-  react-flow-renderer: 10.0.0-next.39_react-dom@17.0.2+react@17.0.2
+  react-flow-renderer: 10.0.0-next.45_react-dom@17.0.2+react@17.0.2
   react-hook-form: 7.27.1_react@17.0.2
   react-icons: 4.3.1_react@17.0.2
   react-json-pretty: 2.2.0_react-dom@17.0.2+react@17.0.2
@@ -73,28 +73,28 @@ dependencies:
   timeago-react: 3.0.4_react@17.0.2
   tippy.js: 6.3.7
   type-route: 0.6.0
-  vite-plugin-environment: 1.1.0_vite@2.8.4
+  vite-plugin-environment: 1.1.0_vite@2.8.5
 
 devDependencies:
   '@hookform/devtools': 4.0.2_e7a5d0029673a64b6216c38417fa4fd0
-  '@types/mapbox-gl': 2.6.1
+  '@types/mapbox-gl': 2.6.2
   '@types/react': 17.0.39
   '@types/react-dom': 17.0.11
   '@types/w3c-web-serial': 1.0.2
   '@types/web-bluetooth': 0.0.12
   '@vitejs/plugin-react': 1.2.0
-  autoprefixer: 10.4.2_postcss@8.4.6
+  autoprefixer: 10.4.2_postcss@8.4.7
   gzipper: 7.0.0
-  postcss: 8.4.6
-  rollup-plugin-visualizer: 5.5.4
+  postcss: 8.4.7
+  rollup-plugin-visualizer: 5.6.0
   tailwindcss: 3.0.23_autoprefixer@10.4.2
   tar: 6.1.11
-  typescript: 4.5.5
+  typescript: 4.6.2
   unimported: 1.19.1
-  vite: 2.8.4
+  vite: 2.8.5
   vite-plugin-cdn-import: 0.3.5
-  vite-plugin-pwa: 0.11.13_vite@2.8.4
-  workbox-window: 6.4.2
+  vite-plugin-pwa: 0.11.13_vite@2.8.5
+  workbox-window: 6.5.0
 
 packages:
 
@@ -143,7 +143,7 @@ packages:
       '@babel/code-frame': 7.16.7
       '@babel/generator': 7.17.3
       '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.17.5
-      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-module-transforms': 7.17.6
       '@babel/helpers': 7.17.2
       '@babel/parser': 7.17.3
       '@babel/template': 7.16.7
@@ -195,8 +195,8 @@ packages:
       semver: 6.3.0
     dev: true
 
-  /@babel/helper-create-class-features-plugin/7.17.1_@babel+core@7.17.5:
-    resolution: {integrity: sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==}
+  /@babel/helper-create-class-features-plugin/7.17.6_@babel+core@7.17.5:
+    resolution: {integrity: sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -293,8 +293,8 @@ packages:
       '@babel/types': 7.17.0
     dev: true
 
-  /@babel/helper-module-transforms/7.16.7:
-    resolution: {integrity: sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==}
+  /@babel/helper-module-transforms/7.17.6:
+    resolution: {integrity: sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-environment-visitor': 7.16.7
@@ -457,20 +457,20 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.17.5
-      '@babel/helper-create-class-features-plugin': 7.17.1_@babel+core@7.17.5
+      '@babel/helper-create-class-features-plugin': 7.17.6_@babel+core@7.17.5
       '@babel/helper-plugin-utils': 7.16.7
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-class-static-block/7.16.7_@babel+core@7.17.5:
-    resolution: {integrity: sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==}
+  /@babel/plugin-proposal-class-static-block/7.17.6_@babel+core@7.17.5:
+    resolution: {integrity: sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.12.0
     dependencies:
       '@babel/core': 7.17.5
-      '@babel/helper-create-class-features-plugin': 7.17.1_@babel+core@7.17.5
+      '@babel/helper-create-class-features-plugin': 7.17.6_@babel+core@7.17.5
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.17.5
     transitivePeerDependencies:
@@ -587,7 +587,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.17.5
-      '@babel/helper-create-class-features-plugin': 7.17.1_@babel+core@7.17.5
+      '@babel/helper-create-class-features-plugin': 7.17.6_@babel+core@7.17.5
       '@babel/helper-plugin-utils': 7.16.7
     transitivePeerDependencies:
       - supports-color
@@ -601,7 +601,7 @@ packages:
     dependencies:
       '@babel/core': 7.17.5
       '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-create-class-features-plugin': 7.17.1_@babel+core@7.17.5
+      '@babel/helper-create-class-features-plugin': 7.17.6_@babel+core@7.17.5
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.17.5
     transitivePeerDependencies:
@@ -931,7 +931,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.17.5
-      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-module-transforms': 7.17.6
       '@babel/helper-plugin-utils': 7.16.7
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
@@ -945,7 +945,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.17.5
-      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-module-transforms': 7.17.6
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/helper-simple-access': 7.16.7
       babel-plugin-dynamic-import-node: 2.3.3
@@ -961,7 +961,7 @@ packages:
     dependencies:
       '@babel/core': 7.17.5
       '@babel/helper-hoist-variables': 7.16.7
-      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-module-transforms': 7.17.6
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/helper-validator-identifier': 7.16.7
       babel-plugin-dynamic-import-node: 2.3.3
@@ -976,7 +976,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.17.5
-      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-module-transforms': 7.17.6
       '@babel/helper-plugin-utils': 7.16.7
     transitivePeerDependencies:
       - supports-color
@@ -1186,7 +1186,7 @@ packages:
       '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.16.7_@babel+core@7.17.5
       '@babel/plugin-proposal-async-generator-functions': 7.16.8_@babel+core@7.17.5
       '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.17.5
-      '@babel/plugin-proposal-class-static-block': 7.16.7_@babel+core@7.17.5
+      '@babel/plugin-proposal-class-static-block': 7.17.6_@babel+core@7.17.5
       '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.17.5
       '@babel/plugin-proposal-export-namespace-from': 7.16.7_@babel+core@7.17.5
       '@babel/plugin-proposal-json-strings': 7.16.7_@babel+core@7.17.5
@@ -1472,8 +1472,8 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/eslintrc/1.1.0:
-    resolution: {integrity: sha512-C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg==}
+  /@eslint/eslintrc/1.2.0:
+    resolution: {integrity: sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
@@ -1505,8 +1505,8 @@ packages:
     dependencies:
       '@emotion/react': 11.8.1_a0c521d4794c7ad97f5f4c1c4a7d5818
       '@emotion/styled': 11.8.1_d24c5a2cd50724e2cbcff1306f0cc72d
-      '@types/lodash': 4.14.178
-      little-state-machine: 4.2.1_react@17.0.2
+      '@types/lodash': 4.14.179
+      little-state-machine: 4.2.3_react@17.0.2
       lodash: 4.17.21
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
@@ -1528,8 +1528,8 @@ packages:
       - supports-color
     dev: true
 
-  /@humanwhocodes/config-array/0.9.3:
-    resolution: {integrity: sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==}
+  /@humanwhocodes/config-array/0.9.5:
+    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -1617,18 +1617,18 @@ packages:
   /@meshtastic/eslint-config/1.0.6:
     resolution: {integrity: sha512-bc9+2yJAWw7Vr/9FlXWbtHw7d8/GZCYQOslY4S88h8+gFfwrkh3xBeBCYHALWgWq1pVM3wHIXXg9x2OT27gGsg==}
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.12.0_c467cf9bb49b295941e83ce479a578b7
-      '@typescript-eslint/parser': 5.12.0_eslint@8.9.0+typescript@4.5.5
-      eslint: 8.9.0
-      eslint-config-prettier: 8.4.0_eslint@8.9.0
-      eslint-import-resolver-typescript: 2.5.0_1326372bbd2fe519ed5ba5fca843a914
-      eslint-plugin-eslint-comments: 3.2.0_eslint@8.9.0
-      eslint-plugin-import: 2.25.4_eslint@8.9.0
-      eslint-plugin-react: 7.28.0_eslint@8.9.0
-      eslint-plugin-react-hooks: 4.3.0_eslint@8.9.0
+      '@typescript-eslint/eslint-plugin': 5.13.0_33fffc354ccfa91fbe7d1677b9395a0a
+      '@typescript-eslint/parser': 5.13.0_eslint@8.10.0+typescript@4.6.2
+      eslint: 8.10.0
+      eslint-config-prettier: 8.4.0_eslint@8.10.0
+      eslint-import-resolver-typescript: 2.5.0_8b406960a2a06af75ddac353adbd0cfd
+      eslint-plugin-eslint-comments: 3.2.0_eslint@8.10.0
+      eslint-plugin-import: 2.25.4_eslint@8.10.0
+      eslint-plugin-react: 7.29.2_eslint@8.10.0
+      eslint-plugin-react-hooks: 4.3.0_eslint@8.10.0
       prettier: 2.5.1
-      prettier-plugin-tailwindcss: 0.1.7_prettier@2.5.1
-      typescript: 4.5.5
+      prettier-plugin-tailwindcss: 0.1.8_prettier@2.5.1
+      typescript: 4.6.2
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1670,8 +1670,8 @@ packages:
     resolution: {integrity: sha512-4tZToEhqCMwMb5PZ04xs7nRDmNGTy4ha8HNBdxmTnmVi4O0Ik/MlCTxX2v5P+OvqTN5CufXAaz7bmldf/fGLjg==}
     dev: false
 
-  /@reduxjs/toolkit/1.7.2_react-redux@7.2.6+react@17.0.2:
-    resolution: {integrity: sha512-wwr3//Ar8ZhM9bS58O+HCIaMlR4Y6SNHfuszz9hKnQuFIKvwaL3Kmjo6fpDKUOjo4Lv54Yi299ed8rofCJ/Vjw==}
+  /@reduxjs/toolkit/1.8.0_react-redux@7.2.6+react@17.0.2:
+    resolution: {integrity: sha512-cdfHWfcvLyhBUDicoFwG1u32JqvwKDxLxDd7zSmSoFw/RhYLOygIRtmaMjPRUUHmVmmAGAvquLLsKKU/677kSQ==}
     peerDependencies:
       react: ^16.9.0 || ^17.0.0 || 18.0.0-beta
       react-redux: ^7.2.1 || ^8.0.0-beta
@@ -1689,8 +1689,8 @@ packages:
       reselect: 4.1.5
     dev: false
 
-  /@rollup/plugin-babel/5.3.0_@babel+core@7.17.5+rollup@2.67.3:
-    resolution: {integrity: sha512-9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw==}
+  /@rollup/plugin-babel/5.3.1_@babel+core@7.17.5+rollup@2.68.0:
+    resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1702,36 +1702,36 @@ packages:
     dependencies:
       '@babel/core': 7.17.5
       '@babel/helper-module-imports': 7.16.7
-      '@rollup/pluginutils': 3.1.0_rollup@2.67.3
-      rollup: 2.67.3
+      '@rollup/pluginutils': 3.1.0_rollup@2.68.0
+      rollup: 2.68.0
     dev: true
 
-  /@rollup/plugin-node-resolve/11.2.1_rollup@2.67.3:
+  /@rollup/plugin-node-resolve/11.2.1_rollup@2.68.0:
     resolution: {integrity: sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.67.3
+      '@rollup/pluginutils': 3.1.0_rollup@2.68.0
       '@types/resolve': 1.17.1
       builtin-modules: 3.2.0
       deepmerge: 4.2.2
       is-module: 1.0.0
       resolve: 1.22.0
-      rollup: 2.67.3
+      rollup: 2.68.0
     dev: true
 
-  /@rollup/plugin-replace/2.4.2_rollup@2.67.3:
+  /@rollup/plugin-replace/2.4.2_rollup@2.68.0:
     resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==}
     peerDependencies:
       rollup: ^1.20.0 || ^2.0.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.67.3
+      '@rollup/pluginutils': 3.1.0_rollup@2.68.0
       magic-string: 0.25.7
-      rollup: 2.67.3
+      rollup: 2.68.0
     dev: true
 
-  /@rollup/pluginutils/3.1.0_rollup@2.67.3:
+  /@rollup/pluginutils/3.1.0_rollup@2.68.0:
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
@@ -1740,7 +1740,7 @@ packages:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
       picomatch: 2.3.1
-      rollup: 2.67.3
+      rollup: 2.68.0
     dev: true
 
   /@rollup/pluginutils/4.1.2:
@@ -1824,18 +1824,18 @@ packages:
     resolution: {integrity: sha1-7ihweulOEdK4J7y+UnC86n8+ce4=}
     dev: false
 
-  /@types/lodash/4.14.178:
-    resolution: {integrity: sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==}
+  /@types/lodash/4.14.179:
+    resolution: {integrity: sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==}
     dev: true
 
-  /@types/mapbox-gl/2.6.1:
-    resolution: {integrity: sha512-ErM4hS1cAH9eJZ+b0bgrF9JuSN1P5i9jhfiJTZ6uOb2Bib7a8tkUivLz/fA69h51JN2CE3G5RE8EZIslgBzIIA==}
+  /@types/mapbox-gl/2.6.2:
+    resolution: {integrity: sha512-SQKvzRFUYpu8rppoo3HavDxRrpAckZYhJ07NVr9KSFwALk2HlYFzPS7jQ8+Cc2xUlgRpmeEmYP3kyco9jdmcyg==}
     dependencies:
       '@types/geojson': 7946.0.8
     dev: true
 
-  /@types/node/17.0.18:
-    resolution: {integrity: sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==}
+  /@types/node/17.0.21:
+    resolution: {integrity: sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==}
     dev: true
 
   /@types/normalize-package-data/2.4.1:
@@ -1874,7 +1874,7 @@ packages:
   /@types/resolve/1.17.1:
     resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
     dependencies:
-      '@types/node': 17.0.18
+      '@types/node': 17.0.21
     dev: true
 
   /@types/scheduler/0.16.2:
@@ -1892,8 +1892,8 @@ packages:
     resolution: {integrity: sha512-Q4sUrowpylCOWjUWFtNwkNBHQUnCL8y44Iq2ZLtVMAuAGIwPSXa3kqIvu2LwXoc2d1jyaaw4Bg354degHrsADw==}
     dev: true
 
-  /@typescript-eslint/eslint-plugin/5.12.0_c467cf9bb49b295941e83ce479a578b7:
-    resolution: {integrity: sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ==}
+  /@typescript-eslint/eslint-plugin/5.13.0_33fffc354ccfa91fbe7d1677b9395a0a:
+    resolution: {integrity: sha512-vLktb2Uec81fxm/cfz2Hd6QaWOs8qdmVAZXLdOBX6JFJDhf6oDZpMzZ4/LZ6SFM/5DgDcxIMIvy3F+O9yZBuiQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -1903,23 +1903,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.12.0_eslint@8.9.0+typescript@4.5.5
-      '@typescript-eslint/scope-manager': 5.12.0
-      '@typescript-eslint/type-utils': 5.12.0_eslint@8.9.0+typescript@4.5.5
-      '@typescript-eslint/utils': 5.12.0_eslint@8.9.0+typescript@4.5.5
+      '@typescript-eslint/parser': 5.13.0_eslint@8.10.0+typescript@4.6.2
+      '@typescript-eslint/scope-manager': 5.13.0
+      '@typescript-eslint/type-utils': 5.13.0_eslint@8.10.0+typescript@4.6.2
+      '@typescript-eslint/utils': 5.13.0_eslint@8.10.0+typescript@4.6.2
       debug: 4.3.3
-      eslint: 8.9.0
+      eslint: 8.10.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
       regexpp: 3.2.0
       semver: 7.3.5
-      tsutils: 3.21.0_typescript@4.5.5
-      typescript: 4.5.5
+      tsutils: 3.21.0_typescript@4.6.2
+      typescript: 4.6.2
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@typescript-eslint/parser/4.33.0_eslint@7.32.0+typescript@4.5.5:
+  /@typescript-eslint/parser/4.33.0_eslint@7.32.0+typescript@4.6.2:
     resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -1931,16 +1931,16 @@ packages:
     dependencies:
       '@typescript-eslint/scope-manager': 4.33.0
       '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.5.5
+      '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.6.2
       debug: 4.3.3
       eslint: 7.32.0
-      typescript: 4.5.5
+      typescript: 4.6.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.12.0_eslint@8.9.0+typescript@4.5.5:
-    resolution: {integrity: sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog==}
+  /@typescript-eslint/parser/5.13.0_eslint@8.10.0+typescript@4.6.2:
+    resolution: {integrity: sha512-GdrU4GvBE29tm2RqWOM0P5QfCtgCyN4hXICj/X9ibKED16136l9ZpoJvCL5pSKtmJzA+NRDzQ312wWMejCVVfg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -1949,12 +1949,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.12.0
-      '@typescript-eslint/types': 5.12.0
-      '@typescript-eslint/typescript-estree': 5.12.0_typescript@4.5.5
+      '@typescript-eslint/scope-manager': 5.13.0
+      '@typescript-eslint/types': 5.13.0
+      '@typescript-eslint/typescript-estree': 5.13.0_typescript@4.6.2
       debug: 4.3.3
-      eslint: 8.9.0
-      typescript: 4.5.5
+      eslint: 8.10.0
+      typescript: 4.6.2
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1967,16 +1967,16 @@ packages:
       '@typescript-eslint/visitor-keys': 4.33.0
     dev: true
 
-  /@typescript-eslint/scope-manager/5.12.0:
-    resolution: {integrity: sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ==}
+  /@typescript-eslint/scope-manager/5.13.0:
+    resolution: {integrity: sha512-T4N8UvKYDSfVYdmJq7g2IPJYCRzwtp74KyDZytkR4OL3NRupvswvmJQJ4CX5tDSurW2cvCc1Ia1qM7d0jpa7IA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.12.0
-      '@typescript-eslint/visitor-keys': 5.12.0
+      '@typescript-eslint/types': 5.13.0
+      '@typescript-eslint/visitor-keys': 5.13.0
     dev: false
 
-  /@typescript-eslint/type-utils/5.12.0_eslint@8.9.0+typescript@4.5.5:
-    resolution: {integrity: sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q==}
+  /@typescript-eslint/type-utils/5.13.0_eslint@8.10.0+typescript@4.6.2:
+    resolution: {integrity: sha512-/nz7qFizaBM1SuqAKb7GLkcNn2buRdDgZraXlkhz+vUGiN1NZ9LzkA595tHHeduAiS2MsHqMNhE2zNzGdw43Yg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -1985,11 +1985,11 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': 5.12.0_eslint@8.9.0+typescript@4.5.5
+      '@typescript-eslint/utils': 5.13.0_eslint@8.10.0+typescript@4.6.2
       debug: 4.3.3
-      eslint: 8.9.0
-      tsutils: 3.21.0_typescript@4.5.5
-      typescript: 4.5.5
+      eslint: 8.10.0
+      tsutils: 3.21.0_typescript@4.6.2
+      typescript: 4.6.2
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1999,12 +1999,12 @@ packages:
     engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
     dev: true
 
-  /@typescript-eslint/types/5.12.0:
-    resolution: {integrity: sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ==}
+  /@typescript-eslint/types/5.13.0:
+    resolution: {integrity: sha512-LmE/KO6DUy0nFY/OoQU0XelnmDt+V8lPQhh8MOVa7Y5k2gGRd6U9Kp3wAjhB4OHg57tUO0nOnwYQhRRyEAyOyg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: false
 
-  /@typescript-eslint/typescript-estree/4.33.0_typescript@4.5.5:
+  /@typescript-eslint/typescript-estree/4.33.0_typescript@4.6.2:
     resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -2019,14 +2019,14 @@ packages:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.5
-      tsutils: 3.21.0_typescript@4.5.5
-      typescript: 4.5.5
+      tsutils: 3.21.0_typescript@4.6.2
+      typescript: 4.6.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.12.0_typescript@4.5.5:
-    resolution: {integrity: sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ==}
+  /@typescript-eslint/typescript-estree/5.13.0_typescript@4.6.2:
+    resolution: {integrity: sha512-Q9cQow0DeLjnp5DuEDjLZ6JIkwGx3oYZe+BfcNuw/POhtpcxMTy18Icl6BJqTSd+3ftsrfuVb7mNHRZf7xiaNA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -2034,31 +2034,31 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.12.0
-      '@typescript-eslint/visitor-keys': 5.12.0
+      '@typescript-eslint/types': 5.13.0
+      '@typescript-eslint/visitor-keys': 5.13.0
       debug: 4.3.3
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.5
-      tsutils: 3.21.0_typescript@4.5.5
-      typescript: 4.5.5
+      tsutils: 3.21.0_typescript@4.6.2
+      typescript: 4.6.2
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@typescript-eslint/utils/5.12.0_eslint@8.9.0+typescript@4.5.5:
-    resolution: {integrity: sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==}
+  /@typescript-eslint/utils/5.13.0_eslint@8.10.0+typescript@4.6.2:
+    resolution: {integrity: sha512-+9oHlPWYNl6AwwoEt5TQryEHwiKRVjz7Vk6kaBeD3/kwHE5YqTGHtm/JZY8Bo9ITOeKutFaXnBlMgSATMJALUQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.9
-      '@typescript-eslint/scope-manager': 5.12.0
-      '@typescript-eslint/types': 5.12.0
-      '@typescript-eslint/typescript-estree': 5.12.0_typescript@4.5.5
-      eslint: 8.9.0
+      '@typescript-eslint/scope-manager': 5.13.0
+      '@typescript-eslint/types': 5.13.0
+      '@typescript-eslint/typescript-estree': 5.13.0_typescript@4.6.2
+      eslint: 8.10.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.9.0
+      eslint-utils: 3.0.0_eslint@8.10.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -2072,11 +2072,11 @@ packages:
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.12.0:
-    resolution: {integrity: sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg==}
+  /@typescript-eslint/visitor-keys/5.13.0:
+    resolution: {integrity: sha512-HLKEAS/qA1V7d9EzcpLFykTePmOQqOFim8oCvhY3pZgQ8Hi38hYpHd9e5GN6nQBFQNecNhws5wkS9Y5XIO0s/g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.12.0
+      '@typescript-eslint/types': 5.13.0
       eslint-visitor-keys: 3.3.0
     dev: false
 
@@ -2135,7 +2135,6 @@ packages:
     resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==}
     engines: {node: '>=0.4.0'}
     hasBin: true
-    dev: false
 
   /ajv/6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
@@ -2245,7 +2244,7 @@ packages:
     engines: {node: '>= 4.0.0'}
     dev: true
 
-  /autoprefixer/10.4.2_postcss@8.4.6:
+  /autoprefixer/10.4.2_postcss@8.4.7:
     resolution: {integrity: sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
@@ -2257,7 +2256,7 @@ packages:
       fraction.js: 4.1.3
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.4.6
+      postcss: 8.4.7
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -2353,7 +2352,7 @@ packages:
     hasBin: true
     dependencies:
       caniuse-lite: 1.0.30001312
-      electron-to-chromium: 1.4.71
+      electron-to-chromium: 1.4.74
       escalade: 3.1.1
       node-releases: 2.0.2
       picocolors: 1.0.0
@@ -2770,8 +2769,8 @@ packages:
       jake: 10.8.2
     dev: true
 
-  /electron-to-chromium/1.4.71:
-    resolution: {integrity: sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==}
+  /electron-to-chromium/1.4.74:
+    resolution: {integrity: sha512-DvQ20M0I4dIH8KcAo7n7E4OEeNafZ1N8z6g6ck+ALCM0ZoV6mpjaX6ekjs31zKlqPzacU3lmjG9PZEa1mQhEpQ==}
     dev: true
 
   /emoji-regex/8.0.0:
@@ -3054,13 +3053,13 @@ packages:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
 
-  /eslint-config-prettier/8.4.0_eslint@8.9.0:
+  /eslint-config-prettier/8.4.0_eslint@8.10.0:
     resolution: {integrity: sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.9.0
+      eslint: 8.10.0
     dev: false
 
   /eslint-import-resolver-node/0.3.6:
@@ -3070,7 +3069,7 @@ packages:
       resolve: 1.22.0
     dev: false
 
-  /eslint-import-resolver-typescript/2.5.0_1326372bbd2fe519ed5ba5fca843a914:
+  /eslint-import-resolver-typescript/2.5.0_8b406960a2a06af75ddac353adbd0cfd:
     resolution: {integrity: sha512-qZ6e5CFr+I7K4VVhQu3M/9xGv9/YmwsEXrsm3nimw8vWaVHRDrQRp26BgCypTxBp3vUp4o5aVEJRiy0F2DFddQ==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3078,8 +3077,8 @@ packages:
       eslint-plugin-import: '*'
     dependencies:
       debug: 4.3.3
-      eslint: 8.9.0
-      eslint-plugin-import: 2.25.4_eslint@8.9.0
+      eslint: 8.10.0
+      eslint-plugin-import: 2.25.4_eslint@8.10.0
       glob: 7.2.0
       is-glob: 4.0.3
       resolve: 1.22.0
@@ -3096,18 +3095,18 @@ packages:
       find-up: 2.1.0
     dev: false
 
-  /eslint-plugin-eslint-comments/3.2.0_eslint@8.9.0:
+  /eslint-plugin-eslint-comments/3.2.0_eslint@8.10.0:
     resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==}
     engines: {node: '>=6.5.0'}
     peerDependencies:
       eslint: '>=4.19.1'
     dependencies:
       escape-string-regexp: 1.0.5
-      eslint: 8.9.0
+      eslint: 8.10.0
       ignore: 5.2.0
     dev: false
 
-  /eslint-plugin-import/2.25.4_eslint@8.9.0:
+  /eslint-plugin-import/2.25.4_eslint@8.10.0:
     resolution: {integrity: sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3117,7 +3116,7 @@ packages:
       array.prototype.flat: 1.2.5
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 8.9.0
+      eslint: 8.10.0
       eslint-import-resolver-node: 0.3.6
       eslint-module-utils: 2.7.3
       has: 1.0.3
@@ -3129,17 +3128,17 @@ packages:
       tsconfig-paths: 3.12.0
     dev: false
 
-  /eslint-plugin-react-hooks/4.3.0_eslint@8.9.0:
+  /eslint-plugin-react-hooks/4.3.0_eslint@8.10.0:
     resolution: {integrity: sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
-      eslint: 8.9.0
+      eslint: 8.10.0
     dev: false
 
-  /eslint-plugin-react/7.28.0_eslint@8.9.0:
-    resolution: {integrity: sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==}
+  /eslint-plugin-react/7.29.2_eslint@8.10.0:
+    resolution: {integrity: sha512-ypEBTKOy5liFQXZWMchJ3LN0JX1uPI6n7MN7OPHKacqXAxq5gYC30TdO7wqGYQyxD1OrzpobdHC3hDmlRWDg9w==}
     engines: {node: '>=4'}
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
@@ -3147,7 +3146,7 @@ packages:
       array-includes: 3.1.4
       array.prototype.flatmap: 1.2.5
       doctrine: 2.1.0
-      eslint: 8.9.0
+      eslint: 8.10.0
       estraverse: 5.3.0
       jsx-ast-utils: 3.2.1
       minimatch: 3.1.2
@@ -3183,13 +3182,13 @@ packages:
       eslint-visitor-keys: 1.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.9.0:
+  /eslint-utils/3.0.0_eslint@8.10.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.9.0
+      eslint: 8.10.0
       eslint-visitor-keys: 2.1.0
     dev: false
 
@@ -3256,13 +3255,13 @@ packages:
       - supports-color
     dev: true
 
-  /eslint/8.9.0:
-    resolution: {integrity: sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q==}
+  /eslint/8.10.0:
+    resolution: {integrity: sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': 1.1.0
-      '@humanwhocodes/config-array': 0.9.3
+      '@eslint/eslintrc': 1.2.0
+      '@humanwhocodes/config-array': 0.9.5
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
@@ -3270,7 +3269,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.9.0
+      eslint-utils: 3.0.0_eslint@8.10.0
       eslint-visitor-keys: 3.3.0
       espree: 9.3.1
       esquery: 1.4.0
@@ -3450,8 +3449,8 @@ packages:
     resolution: {integrity: sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==}
     dev: true
 
-  /framer-motion/6.2.7_react-dom@17.0.2+react@17.0.2:
-    resolution: {integrity: sha512-RExmZCFpJ3OCakoXmZz8iW8ZI5MoaHmVadydetvTSrNaKmZ7ZC/JDQpNyw1NoDG+fchRGP86lXoiTFSQuin+Cg==}
+  /framer-motion/6.2.8_react-dom@17.0.2+react@17.0.2:
+    resolution: {integrity: sha512-4PtBWFJ6NqR350zYVt9AsFDtISTqsdqna79FvSYPfYDXuuqFmiKtZdkTnYPslnsOMedTW0pEvaQ7eqjD+sA+HA==}
     peerDependencies:
       react: '>=16.8 || ^17.0.0 || ^18.0.0'
       react-dom: '>=16.8 || ^17.0.0 || ^18.0.0'
@@ -3644,8 +3643,8 @@ packages:
     resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==}
     dev: false
 
-  /history/5.2.0:
-    resolution: {integrity: sha512-uPSF6lAJb3nSePJ43hN3eKj1dTWpN9gMod0ZssbFTIsen+WehTmEadgL+kg78xLJFdRfrrC//SavDzmRVdE+Ig==}
+  /history/5.3.0:
+    resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
     dependencies:
       '@babel/runtime': 7.17.2
     dev: false
@@ -3915,7 +3914,7 @@ packages:
     resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 17.0.18
+      '@types/node': 17.0.21
       merge-stream: 2.0.0
       supports-color: 7.2.0
     dev: true
@@ -4032,8 +4031,8 @@ packages:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: true
 
-  /little-state-machine/4.2.1_react@17.0.2:
-    resolution: {integrity: sha512-dJ3GVs2WHFZ9B0tSlqXrDcp7ODj6Yw/gp8aGqFcH998QBOXVH5duO4kP+oAFy0ATfZnzYzT0bwxAV/YtiBLeow==}
+  /little-state-machine/4.2.3_react@17.0.2:
+    resolution: {integrity: sha512-USuzo9sbmvvJwZVKUpcjw+pBmmTJKPRJgpjRpTFN0j2uzvH8K4wxd9ueuoRUqJI26FSWB5SnGqt7vbEz8EYSEg==}
     peerDependencies:
       react: ^16.8.0 || ^17
     dependencies:
@@ -4469,14 +4468,14 @@ packages:
       tslib: 2.3.1
     dev: false
 
-  /postcss-js/4.0.0_postcss@8.4.6:
+  /postcss-js/4.0.0_postcss@8.4.7:
     resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
     engines: {node: ^12 || ^14 || >= 16}
     peerDependencies:
       postcss: ^8.3.3
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.4.6
+      postcss: 8.4.7
     dev: true
 
   /postcss-load-config/3.1.3:
@@ -4492,13 +4491,13 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /postcss-nested/5.0.6_postcss@8.4.6:
+  /postcss-nested/5.0.6_postcss@8.4.7:
     resolution: {integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==}
     engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.2.14
     dependencies:
-      postcss: 8.4.6
+      postcss: 8.4.7
       postcss-selector-parser: 6.0.9
     dev: true
 
@@ -4514,8 +4513,8 @@ packages:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
     dev: true
 
-  /postcss/8.4.6:
-    resolution: {integrity: sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==}
+  /postcss/8.4.7:
+    resolution: {integrity: sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
       nanoid: 3.3.1
@@ -4531,8 +4530,8 @@ packages:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  /prettier-plugin-tailwindcss/0.1.7_prettier@2.5.1:
-    resolution: {integrity: sha512-tmBr45hCLuit2Cz9Pwow0/Jl1bGivYGsfcF29O+3sKcE++ybjz9dfie565S3ZsvAeV8uYer9SRMBWDsHPly2Lg==}
+  /prettier-plugin-tailwindcss/0.1.8_prettier@2.5.1:
+    resolution: {integrity: sha512-hwarSBCswAXa+kqYtaAkFr3Vop9o04WOyZs0qo3NyvW8L7f1rif61wRyq0+ArmVThOuRBcJF5hjGXYk86cwemg==}
     engines: {node: '>=12.17.0'}
     peerDependencies:
       prettier: '>=2.2.0'
@@ -4639,8 +4638,8 @@ packages:
       react: 17.0.2
     dev: false
 
-  /react-flow-renderer/10.0.0-next.39_react-dom@17.0.2+react@17.0.2:
-    resolution: {integrity: sha512-3SACoSZsC8svzy52XOkcjPyBhwgVLbWDeIHY5E4RR4LDwOrXIuIIoFUNBLzPox7hz+iQDFAMXqH9B/5uPw0hCw==}
+  /react-flow-renderer/10.0.0-next.45_react-dom@17.0.2+react@17.0.2:
+    resolution: {integrity: sha512-Ag0CHF6fDXRZBVV6eTF0ssLNXAhS5Bv59mtttf9NS06iVz0fcxafFZ7QzQQtv42b0hh7C5aT3iRos0RF2LuIUQ==}
     engines: {node: '>=12'}
     peerDependencies:
       react: 16 || 17
@@ -4653,7 +4652,7 @@ packages:
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
       react-draggable: 4.4.4_react-dom@17.0.2+react@17.0.2
-      zustand: 3.7.0_react@17.0.2
+      zustand: 3.7.1_react@17.0.2
     dev: false
 
   /react-hook-form/7.27.1_react@17.0.2:
@@ -4953,22 +4952,20 @@ packages:
       magic-string: 0.25.7
     dev: true
 
-  /rollup-plugin-terser/7.0.2_rollup@2.67.3:
+  /rollup-plugin-terser/7.0.2_rollup@2.68.0:
     resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==}
     peerDependencies:
       rollup: ^2.0.0
     dependencies:
       '@babel/code-frame': 7.16.7
       jest-worker: 26.6.2
-      rollup: 2.67.3
+      rollup: 2.68.0
       serialize-javascript: 4.0.0
-      terser: 5.10.0
-    transitivePeerDependencies:
-      - acorn
+      terser: 5.11.0
     dev: true
 
-  /rollup-plugin-visualizer/5.5.4:
-    resolution: {integrity: sha512-CJQFUuZ75S1daGEkk62UH7lL6UFCoP86Sn/iz4gXBdamdwFeD5nPGCHHXfXCrly/wNgQOYTH7cdcxk4+OG3Xjw==}
+  /rollup-plugin-visualizer/5.6.0:
+    resolution: {integrity: sha512-CKcc8GTUZjC+LsMytU8ocRr/cGZIfMR7+mdy4YnlyetlmIl/dM8BMnOEpD4JPIGt+ZVW7Db9ZtSsbgyeBH3uTA==}
     engines: {node: '>=12'}
     hasBin: true
     peerDependencies:
@@ -4980,8 +4977,8 @@ packages:
       yargs: 17.3.1
     dev: true
 
-  /rollup/2.67.3:
-    resolution: {integrity: sha512-G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw==}
+  /rollup/2.68.0:
+    resolution: {integrity: sha512-XrMKOYK7oQcTio4wyTz466mucnd8LzkiZLozZ4Rz0zQD+HeX4nUK4B8GrTX/2EvN2/vBF/i2WnaXboPxo0JylA==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
@@ -5104,11 +5101,6 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /source-map-url/0.4.1:
-    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
-    deprecated: See https://github.com/lydell/source-map-url#deprecated
-    dev: true
-
   /source-map/0.5.7:
     resolution: {integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=}
     engines: {node: '>=0.10.0'}
@@ -5305,7 +5297,7 @@ packages:
       autoprefixer: ^10.0.2
     dependencies:
       arg: 5.0.1
-      autoprefixer: 10.4.2_postcss@8.4.6
+      autoprefixer: 10.4.2_postcss@8.4.7
       chalk: 4.1.2
       chokidar: 3.5.3
       color-name: 1.1.4
@@ -5318,10 +5310,10 @@ packages:
       is-glob: 4.0.3
       normalize-path: 3.0.0
       object-hash: 2.2.0
-      postcss: 8.4.6
-      postcss-js: 4.0.0_postcss@8.4.6
+      postcss: 8.4.7
+      postcss-js: 4.0.0_postcss@8.4.7
       postcss-load-config: 3.1.3
-      postcss-nested: 5.0.6_postcss@8.4.6
+      postcss-nested: 5.0.6_postcss@8.4.7
       postcss-selector-parser: 6.0.9
       postcss-value-parser: 4.2.0
       quick-lru: 5.1.1
@@ -5370,16 +5362,12 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /terser/5.10.0:
-    resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==}
+  /terser/5.11.0:
+    resolution: {integrity: sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==}
     engines: {node: '>=10'}
     hasBin: true
-    peerDependencies:
-      acorn: ^8.5.0
-    peerDependenciesMeta:
-      acorn:
-        optional: true
     dependencies:
+      acorn: 8.7.0
       commander: 2.20.3
       source-map: 0.7.3
       source-map-support: 0.5.21
@@ -5461,14 +5449,14 @@ packages:
     resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
     dev: false
 
-  /tsutils/3.21.0_typescript@4.5.5:
+  /tsutils/3.21.0_typescript@4.6.2:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
       typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
       tslib: 1.14.1
-      typescript: 4.5.5
+      typescript: 4.6.2
 
   /type-check/0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
@@ -5498,11 +5486,11 @@ packages:
   /type-route/0.6.0:
     resolution: {integrity: sha512-uh5bxHxHOKNDNTetGwBgtSP5ba3SUtnKcdj3d5AjbIALVbYBwaix4wwfpyxqrE9ia31LknXUc+359FChcC01jw==}
     dependencies:
-      history: 5.2.0
+      history: 5.3.0
     dev: false
 
-  /typescript/4.5.5:
-    resolution: {integrity: sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==}
+  /typescript/4.6.2:
+    resolution: {integrity: sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==}
     engines: {node: '>=4.2.0'}
     hasBin: true
 
@@ -5541,8 +5529,8 @@ packages:
     resolution: {integrity: sha512-p/8XnPnJbL+QhaI5qoBjT4XyJjSz0cXqK6z5JJEIF7HItZLHDldU4XjojnwJEqwghN1fzWJ8bMkPxi614m1/bQ==}
     hasBin: true
     dependencies:
-      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0+typescript@4.5.5
-      '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.5.5
+      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0+typescript@4.6.2
+      '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.6.2
       chalk: 4.1.2
       debug: 4.3.3
       eslint: 7.32.0
@@ -5555,7 +5543,7 @@ packages:
       resolve: 1.22.0
       simple-git: 2.48.0
       term-size: 2.2.1
-      typescript: 4.5.5
+      typescript: 4.6.2
       yargs: 16.2.0
     transitivePeerDependencies:
       - supports-color
@@ -5615,15 +5603,15 @@ packages:
       - rollup
     dev: true
 
-  /vite-plugin-environment/1.1.0_vite@2.8.4:
+  /vite-plugin-environment/1.1.0_vite@2.8.5:
     resolution: {integrity: sha512-ay0vYB8DEB7xB5sqVzOgLyTaGH5jbnvghzoDBmHvMx2Y2k1WUl0QQUuyu7oeiKnmIJDc8ciklhVcGc4lXMKyiA==}
     peerDependencies:
       vite: ^2.7
     dependencies:
-      vite: 2.8.4
+      vite: 2.8.5
     dev: false
 
-  /vite-plugin-pwa/0.11.13_vite@2.8.4:
+  /vite-plugin-pwa/0.11.13_vite@2.8.5:
     resolution: {integrity: sha512-Ssj14m3TRVLfkFEAWSMcFE2d1cSdEZyrVTzfY2lSL+umHYvcIFHVDAY143sygtBCb44OPczsAOmWwBTxwOvh7g==}
     peerDependencies:
       vite: ^2.0.0
@@ -5631,18 +5619,17 @@ packages:
       debug: 4.3.3
       fast-glob: 3.2.11
       pretty-bytes: 5.6.0
-      rollup: 2.67.3
-      vite: 2.8.4
-      workbox-build: 6.4.2
-      workbox-window: 6.4.2
+      rollup: 2.68.0
+      vite: 2.8.5
+      workbox-build: 6.5.0
+      workbox-window: 6.5.0
     transitivePeerDependencies:
       - '@types/babel__core'
-      - acorn
       - supports-color
     dev: true
 
-  /vite/2.8.4:
-    resolution: {integrity: sha512-GwtOkkaT2LDI82uWZKcrpRQxP5tymLnC7hVHHqNkhFNknYr0hJUlDLfhVRgngJvAy3RwypkDCWtTKn1BjO96Dw==}
+  /vite/2.8.5:
+    resolution: {integrity: sha512-C/7EGNa1ugWejol6nOcd/0d8PR70Nzd+XXwsPbnNOfzZw0NN2xyXfmw/GNDHgr5fcaTSO4gjxCJCrwNhQUMhmA==}
     engines: {node: '>=12.2.0'}
     hasBin: true
     peerDependencies:
@@ -5658,9 +5645,9 @@ packages:
         optional: true
     dependencies:
       esbuild: 0.14.23
-      postcss: 8.4.6
+      postcss: 8.4.7
       resolve: 1.22.0
-      rollup: 2.67.3
+      rollup: 2.68.0
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
@@ -5736,30 +5723,30 @@ packages:
     resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
     engines: {node: '>=0.10.0'}
 
-  /workbox-background-sync/6.4.2:
-    resolution: {integrity: sha512-P7c8uG5X2k+DMICH9xeSA9eUlCOjHHYoB42Rq+RtUpuwBxUOflAXR1zdsMWj81LopE4gjKXlTw7BFd1BDAHo7g==}
+  /workbox-background-sync/6.5.0:
+    resolution: {integrity: sha512-rrekt/gt6qOIZsisj6QZfmAFPAnocq1Z603zAjt+qHmeXY8DLPOklVtvrXSaHoHH3qIjUq3SQY5s2x240iTIKw==}
     dependencies:
       idb: 6.1.5
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-broadcast-update/6.4.2:
-    resolution: {integrity: sha512-qnBwQyE0+PWFFc/n4ISXINE49m44gbEreJUYt2ldGH3+CNrLmJ1egJOOyUqqu9R4Eb7QrXcmB34ClXG7S37LbA==}
+  /workbox-broadcast-update/6.5.0:
+    resolution: {integrity: sha512-JC97c7tYqoGWcCfbKO9KHG6lkU+WhXCnDB2j1oFWEiv53nUHy3yjPpzMmAGNLD9oV5lInO15n6V18HfwgkhISw==}
     dependencies:
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-build/6.4.2:
-    resolution: {integrity: sha512-WMdYLhDIsuzViOTXDH+tJ1GijkFp5khSYolnxR/11zmfhNDtuo7jof72xPGFy+KRpsz6tug39RhivCj77qqO0w==}
+  /workbox-build/6.5.0:
+    resolution: {integrity: sha512-da0/1b6//P9+ts7ofcIKcMVPyN6suJvjJASXokF7DsqvUmgRBPcCVV4KCy8QWjgfcz7mzuTpkSbdVHcPFJ/p0A==}
     engines: {node: '>=10.0.0'}
     dependencies:
       '@apideck/better-ajv-errors': 0.3.3_ajv@8.10.0
       '@babel/core': 7.17.5
       '@babel/preset-env': 7.16.11_@babel+core@7.17.5
       '@babel/runtime': 7.17.2
-      '@rollup/plugin-babel': 5.3.0_@babel+core@7.17.5+rollup@2.67.3
-      '@rollup/plugin-node-resolve': 11.2.1_rollup@2.67.3
-      '@rollup/plugin-replace': 2.4.2_rollup@2.67.3
+      '@rollup/plugin-babel': 5.3.1_@babel+core@7.17.5+rollup@2.68.0
+      '@rollup/plugin-node-resolve': 11.2.1_rollup@2.68.0
+      '@rollup/plugin-replace': 2.4.2_rollup@2.68.0
       '@surma/rollup-plugin-off-main-thread': 2.2.3
       ajv: 8.10.0
       common-tags: 1.8.2
@@ -5768,120 +5755,118 @@ packages:
       glob: 7.2.0
       lodash: 4.17.21
       pretty-bytes: 5.6.0
-      rollup: 2.67.3
-      rollup-plugin-terser: 7.0.2_rollup@2.67.3
+      rollup: 2.68.0
+      rollup-plugin-terser: 7.0.2_rollup@2.68.0
       source-map: 0.8.0-beta.0
-      source-map-url: 0.4.1
       stringify-object: 3.3.0
       strip-comments: 2.0.1
       tempy: 0.6.0
       upath: 1.2.0
-      workbox-background-sync: 6.4.2
-      workbox-broadcast-update: 6.4.2
-      workbox-cacheable-response: 6.4.2
-      workbox-core: 6.4.2
-      workbox-expiration: 6.4.2
-      workbox-google-analytics: 6.4.2
-      workbox-navigation-preload: 6.4.2
-      workbox-precaching: 6.4.2
-      workbox-range-requests: 6.4.2
-      workbox-recipes: 6.4.2
-      workbox-routing: 6.4.2
-      workbox-strategies: 6.4.2
-      workbox-streams: 6.4.2
-      workbox-sw: 6.4.2
-      workbox-window: 6.4.2
+      workbox-background-sync: 6.5.0
+      workbox-broadcast-update: 6.5.0
+      workbox-cacheable-response: 6.5.0
+      workbox-core: 6.5.0
+      workbox-expiration: 6.5.0
+      workbox-google-analytics: 6.5.0
+      workbox-navigation-preload: 6.5.0
+      workbox-precaching: 6.5.0
+      workbox-range-requests: 6.5.0
+      workbox-recipes: 6.5.0
+      workbox-routing: 6.5.0
+      workbox-strategies: 6.5.0
+      workbox-streams: 6.5.0
+      workbox-sw: 6.5.0
+      workbox-window: 6.5.0
     transitivePeerDependencies:
       - '@types/babel__core'
-      - acorn
       - supports-color
     dev: true
 
-  /workbox-cacheable-response/6.4.2:
-    resolution: {integrity: sha512-9FE1W/cKffk1AJzImxgEN0ceWpyz1tqNjZVtA3/LAvYL3AC5SbIkhc7ZCO82WmO9IjTfu8Vut2X/C7ViMSF7TA==}
+  /workbox-cacheable-response/6.5.0:
+    resolution: {integrity: sha512-sqAtWAiBwWvI8HG/2Do7BeKPhHuUczt22ORkAjkH9DfTq9LuWRFd6T4HAMqX5G8F1gM9XA2UPlxRrEeSpFIz/A==}
     dependencies:
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-core/6.4.2:
-    resolution: {integrity: sha512-1U6cdEYPcajRXiboSlpJx6U7TvhIKbxRRerfepAJu2hniKwJ3DHILjpU/zx3yvzSBCWcNJDoFalf7Vgd7ey/rw==}
+  /workbox-core/6.5.0:
+    resolution: {integrity: sha512-5SPwNipUzYBhrneLVT02JFA0fw3LG82jFAN/G2NzxkIW10t4MVZuML2nU94bbkgjq25u0fkY8+4JXzMfHgxEWQ==}
     dev: true
 
-  /workbox-expiration/6.4.2:
-    resolution: {integrity: sha512-0hbpBj0tDnW+DZOUmwZqntB/8xrXOgO34i7s00Si/VlFJvvpRKg1leXdHHU8ykoSBd6+F2KDcMP3swoCi5guLw==}
+  /workbox-expiration/6.5.0:
+    resolution: {integrity: sha512-y3WRkKRy/gMuZZNkrLFahjY0QZtLoq+QfhTbVAsOGHVg1CCtnNbeFAnEidQs7UisI2BK76VqQPvM7hEOFyZ92A==}
     dependencies:
       idb: 6.1.5
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-google-analytics/6.4.2:
-    resolution: {integrity: sha512-u+gxs3jXovPb1oul4CTBOb+T9fS1oZG+ZE6AzS7l40vnyfJV79DaLBvlpEZfXGv3CjMdV1sT/ltdOrKzo7HcGw==}
+  /workbox-google-analytics/6.5.0:
+    resolution: {integrity: sha512-CHHh55wMNCc/BV1URrzEM2Zjgf6g2CV6QpAAc1pBRqaLY5755PeQZbp3o8KbJEM7YsC9mIBeQVsOkSKkGS30bg==}
     dependencies:
-      workbox-background-sync: 6.4.2
-      workbox-core: 6.4.2
-      workbox-routing: 6.4.2
-      workbox-strategies: 6.4.2
+      workbox-background-sync: 6.5.0
+      workbox-core: 6.5.0
+      workbox-routing: 6.5.0
+      workbox-strategies: 6.5.0
     dev: true
 
-  /workbox-navigation-preload/6.4.2:
-    resolution: {integrity: sha512-viyejlCtlKsbJCBHwhSBbWc57MwPXvUrc8P7d+87AxBGPU+JuWkT6nvBANgVgFz6FUhCvRC8aYt+B1helo166g==}
+  /workbox-navigation-preload/6.5.0:
+    resolution: {integrity: sha512-ktrRQzXJ0zFy0puOtCa49wE3BSBGUB8KRMot3tEieikCkSO0wMLmiCb9GwTVvNMJLl0THRlsdFoI93si04nTxA==}
     dependencies:
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-precaching/6.4.2:
-    resolution: {integrity: sha512-CZ6uwFN/2wb4noHVlALL7UqPFbLfez/9S2GAzGAb0Sk876ul9ukRKPJJ6gtsxfE2HSTwqwuyNVa6xWyeyJ1XSA==}
+  /workbox-precaching/6.5.0:
+    resolution: {integrity: sha512-IVLzgHx38T6LphJyEOltd7XAvpDi73p85uCT2ZtT1HHg9FAYC49a+5iHUVOnqye73fLW20eiAMFcnehGxz9RWg==}
     dependencies:
-      workbox-core: 6.4.2
-      workbox-routing: 6.4.2
-      workbox-strategies: 6.4.2
+      workbox-core: 6.5.0
+      workbox-routing: 6.5.0
+      workbox-strategies: 6.5.0
     dev: true
 
-  /workbox-range-requests/6.4.2:
-    resolution: {integrity: sha512-SowF3z69hr3Po/w7+xarWfzxJX/3Fo0uSG72Zg4g5FWWnHpq2zPvgbWerBZIa81zpJVUdYpMa3akJJsv+LaO1Q==}
+  /workbox-range-requests/6.5.0:
+    resolution: {integrity: sha512-+qTELdGZE5rOjuv+ifFrfRDN8Uvzpbm5Fal7qSUqB1V1DLCMxPwHCj6mWwQBRKBpW7G09kAwewH7zA3Asjkf/Q==}
     dependencies:
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-recipes/6.4.2:
-    resolution: {integrity: sha512-/oVxlZFpAjFVbY+3PoGEXe8qyvtmqMrTdWhbOfbwokNFtUZ/JCtanDKgwDv9x3AebqGAoJRvQNSru0F4nG+gWA==}
+  /workbox-recipes/6.5.0:
+    resolution: {integrity: sha512-7hWZAIcXmvr31NwYSWaQIrnThCH/Dx9+eYv/YdkpUeWIXRiHRkYvP1FdiHItbLSjL4Y6K7cy2Y9y5lGCkgaE4w==}
     dependencies:
-      workbox-cacheable-response: 6.4.2
-      workbox-core: 6.4.2
-      workbox-expiration: 6.4.2
-      workbox-precaching: 6.4.2
-      workbox-routing: 6.4.2
-      workbox-strategies: 6.4.2
+      workbox-cacheable-response: 6.5.0
+      workbox-core: 6.5.0
+      workbox-expiration: 6.5.0
+      workbox-precaching: 6.5.0
+      workbox-routing: 6.5.0
+      workbox-strategies: 6.5.0
     dev: true
 
-  /workbox-routing/6.4.2:
-    resolution: {integrity: sha512-0ss/n9PAcHjTy4Ad7l2puuod4WtsnRYu9BrmHcu6Dk4PgWeJo1t5VnGufPxNtcuyPGQ3OdnMdlmhMJ57sSrrSw==}
+  /workbox-routing/6.5.0:
+    resolution: {integrity: sha512-w1A9OVa/yYStu9ds0Dj+TC6zOAoskKlczf+wZI5mrM9nFCt/KOMQiFp1/41DMFPrrN/8KlZTS3Cel/Ttutw93Q==}
     dependencies:
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-strategies/6.4.2:
-    resolution: {integrity: sha512-YXh9E9dZGEO1EiPC3jPe2CbztO5WT8Ruj8wiYZM56XqEJp5YlGTtqRjghV+JovWOqkWdR+amJpV31KPWQUvn1Q==}
+  /workbox-strategies/6.5.0:
+    resolution: {integrity: sha512-Ngnwo+tfGw4uKSlTz3h1fYKb/lCV7SDI/dtTb8VaJzRl0N9XssloDGYERBmF6BN/DV/x3bnRsshfobnKI/3z0g==}
     dependencies:
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
-  /workbox-streams/6.4.2:
-    resolution: {integrity: sha512-ROEGlZHGVEgpa5bOZefiJEVsi5PsFjJG9Xd+wnDbApsCO9xq9rYFopF+IRq9tChyYzhBnyk2hJxbQVWphz3sog==}
+  /workbox-streams/6.5.0:
+    resolution: {integrity: sha512-ZbeaZINkju4x45P9DFyRbOYInE+dyNAJIelflz4f9AOAdm+zZUJCooU4MdfsedVhHiTIA6pCD/3jCmW1XbvlbA==}
     dependencies:
-      workbox-core: 6.4.2
-      workbox-routing: 6.4.2
+      workbox-core: 6.5.0
+      workbox-routing: 6.5.0
     dev: true
 
-  /workbox-sw/6.4.2:
-    resolution: {integrity: sha512-A2qdu9TLktfIM5NE/8+yYwfWu+JgDaCkbo5ikrky2c7r9v2X6DcJ+zSLphNHHLwM/0eVk5XVf1mC5HGhYpMhhg==}
+  /workbox-sw/6.5.0:
+    resolution: {integrity: sha512-uPGJ9Yost4yabnCko/IuhouquoQKrWOEqLq7L/xVYtltWe4+J8Hw8iPCVtxvXQ26hffd7MaFWUAN83j2ZWbxRg==}
     dev: true
 
-  /workbox-window/6.4.2:
-    resolution: {integrity: sha512-KVyRKmrJg7iB+uym/B/CnEUEFG9CvnTU1Bq5xpXHbtgD9l+ShDekSl1wYpqw/O0JfeeQVOFb8CiNfvnwWwqnWQ==}
+  /workbox-window/6.5.0:
+    resolution: {integrity: sha512-DOrhiTnWup/CsNstO2uvfdKM4kdStgHd31xGGvBcoCE3Are3DRcy5s3zz3PedcAR1AKskQj3BXz0UhzQiOq8nA==}
     dependencies:
       '@types/trusted-types': 2.0.2
-      workbox-core: 6.4.2
+      workbox-core: 6.5.0
     dev: true
 
   /wrap-ansi/7.0.0:
@@ -5919,8 +5904,8 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /yargs-parser/21.0.0:
-    resolution: {integrity: sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==}
+  /yargs-parser/21.0.1:
+    resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==}
     engines: {node: '>=12'}
     dev: true
 
@@ -5947,11 +5932,11 @@ packages:
       require-directory: 2.1.1
       string-width: 4.2.3
       y18n: 5.0.8
-      yargs-parser: 21.0.0
+      yargs-parser: 21.0.1
     dev: true
 
-  /zustand/3.7.0_react@17.0.2:
-    resolution: {integrity: sha512-USzVzLGrvZ8VK1/sEsOAmeqa8N7D3OBdZskVaL7DL89Q4QLTYD053iIlZ5KDidyZ+Od80Dttin/f8ZulOLFFDQ==}
+  /zustand/3.7.1_react@17.0.2:
+    resolution: {integrity: sha512-wHBCZlKj+bg03/hP+Tzv24YhnqqP8MCeN9ECPDXoF01062SIbnfl3j9O0znkDw1lNTY0a8WN3F///a0UhhaEqg==}
     engines: {node: '>=12.7.0'}
     peerDependencies:
       react: '>=16.8'
diff --git a/src/App.tsx b/src/App.tsx
index e028e12e..e133258d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -19,7 +19,7 @@ export const App = (): JSX.Element => {
     <div className={`h-screen w-screen ${appState.darkMode ? 'dark' : ''}`}>
       <ContextMenu>
         <Connection />
-        <div className="flex h-full flex-col bg-gray-200 dark:bg-secondaryDark">
+        <div className="flex h-full flex-col">
           <div className="flex min-h-0 w-full flex-grow">
             {route.name === 'messages' && <Messages />}
             {route.name === 'nodes' && <Nodes />}
diff --git a/src/components/Connection.tsx b/src/components/Connection.tsx
index 76cd6b18..afa62ef2 100644
--- a/src/components/Connection.tsx
+++ b/src/components/Connection.tsx
@@ -98,7 +98,7 @@ export const Connection = (): JSX.Element => {
           </div>
         </div>
         <div className="md:w-1/2">
-          <div className="h-96 overflow-y-auto rounded-md border border-gray-300 bg-gray-200 p-2 shadow-md dark:border-gray-600 dark:bg-primaryDark dark:text-gray-400">
+          <div className="h-96 overflow-y-auto rounded-md border border-gray-400 bg-gray-200 p-2 drop-shadow-md dark:border-gray-600 dark:bg-tertiaryDark dark:text-gray-400">
             {meshtasticState.logs.length === 0 && (
               <div className="flex h-full w-full">
                 <m.img
diff --git a/src/components/MapBox/MapboxProvider.tsx b/src/components/MapBox/MapboxProvider.tsx
index f0c7c781..f31f16a0 100644
--- a/src/components/MapBox/MapboxProvider.tsx
+++ b/src/components/MapBox/MapboxProvider.tsx
@@ -4,6 +4,7 @@ import { useEffect, useRef } from 'react';
 import { ScaleControl } from 'mapbox-gl';
 
 import { MapboxContext } from '@components/MapBox/mapboxContext';
+import { MapStyles } from '@core/mapStyles';
 import {
   setBearing,
   setLatLng,
@@ -15,8 +16,6 @@ import { useAppDispatch } from '@hooks/useAppDispatch';
 import { useAppSelector } from '@hooks/useAppSelector';
 import { useCreateMapbox } from '@hooks/useCreateMapbox';
 
-import { MapStyles } from '../../pages/Map/styles';
-
 export type MapboxProviderProps = {
   children: React.ReactNode;
 };
diff --git a/src/components/Tab.tsx b/src/components/Tab.tsx
index 2b5f96d9..b71d9951 100644
--- a/src/components/Tab.tsx
+++ b/src/components/Tab.tsx
@@ -24,7 +24,7 @@ export const Tab = ({
     <div
       className={`max-w-[10rem] md:flex-grow ${
         active
-          ? 'bg-gray-100 dark:bg-primaryDark'
+          ? 'bg-white dark:bg-primaryDark'
           : 'bg-gray-300 dark:bg-secondaryDark'
       }`}
     >
@@ -32,7 +32,7 @@ export const Tab = ({
         className={`group flex flex-grow cursor-pointer select-none py-2 hover:underline dark:text-white ${
           active
             ? 'z-10 rounded-t-lg bg-gray-300 shadow-inner dark:bg-secondaryDark'
-            : 'bg-gray-100 shadow-md dark:bg-primaryDark'
+            : 'bg-white drop-shadow-md dark:bg-primaryDark'
         } ${activeRight ? 'rounded-br-lg' : ''} ${
           activeLeft ? 'rounded-bl-lg' : ''
         }`}
diff --git a/src/components/Tabs.tsx b/src/components/Tabs.tsx
new file mode 100644
index 00000000..d0123fec
--- /dev/null
+++ b/src/components/Tabs.tsx
@@ -0,0 +1,35 @@
+import type React from 'react';
+
+import { Tab, TabProps } from './Tab';
+
+export interface TabsProps {
+  tabs: Omit<TabProps, 'activeLeft' | 'activeRight'>[];
+}
+
+export const Tabs = ({ tabs }: TabsProps): JSX.Element => {
+  return (
+    <div className="flex flex-grow bg-gray-300 dark:bg-secondaryDark">
+      <div
+        className={`h-full w-2 bg-white dark:bg-primaryDark ${
+          tabs[0].active ? 'rounded-br-lg' : ''
+        }`}
+      />
+      {tabs.map((tab, index) => (
+        <Tab
+          key={index}
+          link={tab.link}
+          title={tab.title}
+          icon={tab.icon}
+          active={tab.active}
+          activeLeft={tabs[index - 1]?.active}
+          activeRight={tabs[index + 1]?.active}
+        />
+      ))}
+      <div
+        className={`h-full flex-grow bg-white drop-shadow-md dark:bg-primaryDark ${
+          tabs[tabs.length - 1].active ? 'rounded-bl-lg' : ''
+        }`}
+      />
+    </div>
+  );
+};
diff --git a/src/components/connection/BLE.tsx b/src/components/connection/BLE.tsx
index 66c79c3c..aefbbb1e 100644
--- a/src/components/connection/BLE.tsx
+++ b/src/components/connection/BLE.tsx
@@ -37,7 +37,7 @@ export const BLE = ({ connecting }: BLEProps): JSX.Element => {
 
   return (
     <form onSubmit={onSubmit} className="flex flex-grow flex-col">
-      <div className="flex flex-grow flex-col gap-2 overflow-y-auto rounded-md border border-gray-300 bg-gray-200 p-2 dark:border-gray-600 dark:bg-secondaryDark dark:text-gray-400">
+      <div className="flex flex-grow flex-col gap-2 overflow-y-auto rounded-md border border-gray-400 bg-gray-200 p-2 dark:border-gray-600 dark:bg-tertiaryDark dark:text-gray-400">
         {bleDevices.length > 0 ? (
           bleDevices.map((device, index) => (
             <div
diff --git a/src/components/connection/Serial.tsx b/src/components/connection/Serial.tsx
index 5019a04c..497f0054 100644
--- a/src/components/connection/Serial.tsx
+++ b/src/components/connection/Serial.tsx
@@ -39,7 +39,7 @@ export const Serial = ({ connecting }: SerialProps): JSX.Element => {
 
   return (
     <form onSubmit={onSubmit} className="flex flex-grow flex-col">
-      <div className="flex flex-grow flex-col gap-2 overflow-y-auto rounded-md border border-gray-300 bg-gray-200 p-2 dark:border-gray-600 dark:bg-secondaryDark dark:text-gray-400">
+      <div className="flex flex-grow flex-col gap-2 overflow-y-auto rounded-md border border-gray-400 bg-gray-200 p-2 dark:border-gray-600 dark:bg-tertiaryDark dark:text-gray-400">
         {serialDevices.length > 0 ? (
           serialDevices.map((device, index) => (
             <div
diff --git a/src/components/generic/Card.tsx b/src/components/generic/Card.tsx
index 2d32ddce..e8b0d44e 100644
--- a/src/components/generic/Card.tsx
+++ b/src/components/generic/Card.tsx
@@ -23,13 +23,13 @@ export const Card = ({
   return (
     <Draggable handle=".handle" disabled={!draggable}>
       <div
-        className={`flex h-full w-full flex-col rounded-md shadow-md ${
-          border ? 'border border-gray-300 dark:border-gray-600' : ''
+        className={`flex h-full w-full flex-col rounded-md drop-shadow-md ${
+          border ? 'border border-gray-400 dark:border-gray-600' : ''
         } ${className ?? ''}`}
       >
         {(title || actions) && (
           <div
-            className={`w-full select-none justify-between rounded-t-md border-b border-gray-300 bg-gray-200 p-2 px-2 text-lg font-medium dark:border-gray-600 dark:bg-primaryDark dark:text-white ${
+            className={`w-full select-none justify-between rounded-t-md border-b border-gray-400 bg-gray-200 p-2 px-2 text-lg font-medium dark:border-gray-600 dark:bg-tertiaryDark dark:text-white ${
               draggable ? 'cursor-move' : ''
             }`}
           >
@@ -41,9 +41,9 @@ export const Card = ({
         )}
 
         <m.div
-          className={`flex flex-grow select-none flex-col gap-4 bg-white p-4 dark:bg-secondaryDark  ${
+          className={`flex flex-grow select-none flex-col gap-4 bg-white p-4 dark:bg-primaryDark  ${
             title || actions ? 'rounded-b-md' : 'rounded-md'
-          } ${draggable ? '' : 'bg-white dark:bg-primaryDark'}`}
+          }`}
           initial={{ opacity: 0 }}
           animate={{ opacity: 1 }}
           exit={{ opacity: 0 }}
diff --git a/src/components/generic/ContextMenu.tsx b/src/components/generic/ContextMenu.tsx
index bed23a93..1501f4ce 100644
--- a/src/components/generic/ContextMenu.tsx
+++ b/src/components/generic/ContextMenu.tsx
@@ -41,7 +41,7 @@ export const ContextMenu = ({
       {visible && (
         <div
           style={{ top: position.y, left: position.x }}
-          className="fixed z-50 w-60 gap-2 divide-y divide-gray-300 rounded-md border border-gray-300 font-medium shadow-md backdrop-blur-xl dark:divide-gray-600 dark:border-gray-600  dark:text-gray-400"
+          className="fixed z-50 w-60 gap-2 divide-y divide-gray-300 rounded-md border border-gray-400 font-medium drop-shadow-md backdrop-blur-xl dark:divide-gray-600 dark:border-gray-600  dark:text-gray-400"
         >
           {items}
           <ContextItem title="Menu item" icon={<FiActivity />} />
diff --git a/src/components/generic/Modal.tsx b/src/components/generic/Modal.tsx
index 6c305d6c..a44d4185 100644
--- a/src/components/generic/Modal.tsx
+++ b/src/components/generic/Modal.tsx
@@ -36,7 +36,7 @@ export const Modal = ({
             animate={{ opacity: 1 }}
             exit={{ opacity: 0 }}
             transition={{ duration: 0.1 }}
-            className="fixed h-full w-full backdrop-blur-md backdrop-filter"
+            className="fixed h-full w-full backdrop-blur-md backdrop-brightness-75 backdrop-filter"
             onClick={(): void => {
               bgDismiss && onClose();
             }}
diff --git a/src/components/generic/Sidebar/CollapsibleSection.tsx b/src/components/generic/Sidebar/CollapsibleSection.tsx
index 3e83c33d..6f14d453 100644
--- a/src/components/generic/Sidebar/CollapsibleSection.tsx
+++ b/src/components/generic/Sidebar/CollapsibleSection.tsx
@@ -21,8 +21,10 @@ export const CollapsibleSection = ({
     <m.div>
       <m.div
         layout
-        className={`w-full cursor-pointer select-none overflow-hidden border-l-4 border-b border-gray-300 p-2 text-sm font-medium dark:border-primaryDark dark:bg-secondaryDark dark:text-gray-400 ${
-          open ? 'dark:border-l-primary' : 'dark:border-secondaryDark'
+        className={`w-full cursor-pointer select-none overflow-hidden border-l-4 border-b bg-gray-200 p-2 text-sm font-medium dark:border-primaryDark dark:bg-tertiaryDark dark:text-gray-400 ${
+          open
+            ? 'border-l-primary dark:border-l-primary'
+            : 'border-gray-400 dark:border-secondaryDark'
         }`}
       >
         <m.div
diff --git a/src/components/generic/Sidebar/ExternalSection.tsx b/src/components/generic/Sidebar/ExternalSection.tsx
index 693d5409..c6da877e 100644
--- a/src/components/generic/Sidebar/ExternalSection.tsx
+++ b/src/components/generic/Sidebar/ExternalSection.tsx
@@ -27,8 +27,10 @@ export const ExternalSection = ({
     >
       <m.div
         layout
-        className={`w-full cursor-pointer select-none overflow-hidden border-l-4 dark:bg-secondaryDark dark:text-gray-400 ${
-          active ? 'border-primary' : 'dark:border-secondaryDark'
+        className={`w-full cursor-pointer select-none overflow-hidden border-l-4 bg-gray-200 dark:bg-tertiaryDark dark:text-gray-400 ${
+          active
+            ? 'border-l-primary dark:border-l-primary'
+            : 'border-gray-400 dark:border-secondaryDark'
         }`}
       >
         <m.div
@@ -36,7 +38,7 @@ export const ExternalSection = ({
           onClick={toggleOpen}
           whileHover={{ scale: 1.01 }}
           whileTap={{ scale: 0.99 }}
-          className="flex justify-between gap-2 border-b border-gray-300 p-2 text-sm font-medium dark:border-primaryDark"
+          className="flex justify-between gap-2 border-b border-gray-400 p-2 text-sm font-medium dark:border-primaryDark"
         >
           <m.div className="flex gap-2 ">
             <m.div className="my-auto">{icon}</m.div>
diff --git a/src/components/generic/Sidebar/SidebarOverlay.tsx b/src/components/generic/Sidebar/SidebarOverlay.tsx
index af7439f6..bbae70d1 100644
--- a/src/components/generic/Sidebar/SidebarOverlay.tsx
+++ b/src/components/generic/Sidebar/SidebarOverlay.tsx
@@ -24,7 +24,7 @@ export const SidebarOverlay = ({
     <AnimatePresence>
       {open && (
         <m.div
-          className="absolute z-30 flex h-full w-full flex-col bg-gray-100 dark:bg-primaryDark"
+          className="absolute z-30 flex h-full w-full flex-col bg-white dark:bg-primaryDark"
           animate={direction === 'x' ? { translateX: 0 } : { translateY: 0 }}
           initial={
             direction === 'x' ? { translateX: '-100%' } : { translateY: '100%' }
@@ -35,15 +35,20 @@ export const SidebarOverlay = ({
           transition={{ type: 'just' }}
         >
           <AnimateSharedLayout>
-            <div className="flex gap-2 border-b border-gray-300 p-2 dark:border-gray-600">
-              <IconButton
-                onClick={(): void => {
-                  close();
-                }}
-                icon={<FiArrowLeft />}
-              />
-              <div className="my-auto text-lg font-medium dark:text-white">
-                {title}
+            {/* <div className="flex gap-2 border-b border-gray-400 p-2 dark:border-gray-600"> */}
+            <div className="bg-white px-1 pt-1 drop-shadow-md dark:bg-primaryDark">
+              <div className="flex h-10 gap-1">
+                <div className="my-auto">
+                  <IconButton
+                    onClick={(): void => {
+                      close();
+                    }}
+                    icon={<FiArrowLeft />}
+                  />
+                </div>
+                <div className="my-auto text-lg font-medium dark:text-white">
+                  {title}
+                </div>
               </div>
             </div>
             <div className="flex-grow overflow-y-auto">{children}</div>
diff --git a/src/components/generic/button/Button.tsx b/src/components/generic/button/Button.tsx
index 4b6e72a5..9286ee7b 100644
--- a/src/components/generic/button/Button.tsx
+++ b/src/components/generic/button/Button.tsx
@@ -61,7 +61,7 @@ export const Button = ({
       ${
         disabled
           ? 'cursor-not-allowed bg-white dark:bg-primaryDark'
-          : 'cursor-pointer hover:bg-gray-100 hover:shadow-md dark:hover:bg-secondaryDark'
+          : 'cursor-pointer hover:bg-white hover:drop-shadow-md dark:hover:bg-secondaryDark'
       } ${border ? 'border-gray-400 dark:border-gray-200' : ''} ${
         className ?? ''
       }`}
diff --git a/src/components/layout/Sidebar/index.tsx b/src/components/layout/Sidebar/index.tsx
index b9500cb4..e14030d4 100644
--- a/src/components/layout/Sidebar/index.tsx
+++ b/src/components/layout/Sidebar/index.tsx
@@ -22,7 +22,7 @@ export const Sidebar = ({
         appState.mobileNavOpen ? 'flex' : 'hidden'
       }`}
     >
-      <div className="flex h-full w-full flex-col shadow-xl dark:bg-primaryDark">
+      <div className="flex h-full w-full flex-col drop-shadow-xl dark:bg-primaryDark">
         <div className="relative flex-grow gap-1">
           <div className="absolute h-full w-full">{children}</div>
           <Settings open={settingsOpen} setOpen={setSettingsOpen} />
diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx
index de140f90..85f96b31 100644
--- a/src/components/layout/index.tsx
+++ b/src/components/layout/index.tsx
@@ -2,7 +2,7 @@ import type React from 'react';
 import { useState } from 'react';
 
 import { ErrorBoundary } from 'react-error-boundary';
-import { FiMessageCircle, FiSettings, FiTag } from 'react-icons/fi';
+import { FiMessageCircle, FiSettings } from 'react-icons/fi';
 import { RiMindMap, RiRoadMapLine } from 'react-icons/ri';
 import { VscExtensions } from 'react-icons/vsc';
 
@@ -11,7 +11,8 @@ import { IconButton } from '@components/generic/button/IconButton';
 import { Sidebar } from '@components/layout/Sidebar';
 
 import { ErrorFallback } from '../ErrorFallback';
-import { Tab } from '../Tab';
+import type { TabProps } from '../Tab';
+import { Tabs } from '../Tabs';
 
 export interface LayoutProps {
   title: string;
@@ -30,7 +31,7 @@ export const Layout = ({
 
   const route = useRoute();
 
-  const tabs = [
+  const tabs: Omit<TabProps, 'activeLeft' | 'activeRight'>[] = [
     {
       title: 'Messages',
       icon: <FiMessageCircle />,
@@ -55,22 +56,20 @@ export const Layout = ({
       link: routes.extensions().link,
       active: route.name === 'extensions',
     },
-    {
-      title: 'Temp',
-      icon: <FiTag />,
-      link: routes.extensions().link,
-      active: route.name === 'map',
-    },
   ];
 
   return (
-    <div className="relative flex w-full bg-gray-100 dark:bg-secondaryDark md:overflow-hidden md:shadow-xl">
+    <div className="relative flex w-full bg-white dark:bg-secondaryDark ">
       <div className="flex flex-grow">
         <Sidebar settingsOpen={settingsOpen} setSettingsOpen={setSettingsOpen}>
-          <div className="flex gap-2 border-b border-gray-300 p-2 dark:border-gray-600">
-            <IconButton icon={icon} />
-            <div className="my-auto text-lg font-medium dark:text-white">
-              {title}
+          <div className="bg-white px-1 pt-1 drop-shadow-md dark:bg-primaryDark">
+            <div className="flex h-10 gap-1">
+              <div className="my-auto">
+                <IconButton icon={icon} />
+              </div>
+              <div className="my-auto text-lg font-medium dark:text-white">
+                {title}
+              </div>
             </div>
           </div>
           <div className="flex flex-col gap-2">{sidebarContents}</div>
@@ -78,10 +77,10 @@ export const Layout = ({
       </div>
       <ErrorBoundary FallbackComponent={ErrorFallback}>
         <div className="flex h-full w-full flex-col bg-gray-300 dark:bg-secondaryDark">
-          <div className="flex w-full bg-gray-100 pt-1 dark:bg-primaryDark">
-            <div className="h-8">
+          <div className="flex w-full bg-white pt-1 dark:bg-primaryDark">
+            <div className="z-10 -mr-2 h-8">
               <IconButton
-                className="mx-1 rounded-b-none p-3"
+                className="m-1"
                 icon={<FiSettings />}
                 onClick={(): void => {
                   setSettingsOpen(!settingsOpen);
@@ -89,18 +88,7 @@ export const Layout = ({
                 active={settingsOpen}
               />
             </div>
-            {tabs.map((tab, index) => (
-              <Tab
-                key={index}
-                link={tab.link}
-                title={tab.title}
-                icon={tab.icon}
-                active={tab.active}
-                activeLeft={tabs[index - 1]?.active}
-                activeRight={tabs[index + 1]?.active}
-              />
-            ))}
-            <div className="-z-10 flex-grow shadow-md" />
+            <Tabs tabs={tabs} />
           </div>
           <div className="flex flex-grow">{children}</div>
         </div>
diff --git a/src/components/menu/BottomNav.tsx b/src/components/menu/BottomNav.tsx
index d2394312..9212d5ac 100644
--- a/src/components/menu/BottomNav.tsx
+++ b/src/components/menu/BottomNav.tsx
@@ -41,7 +41,7 @@ export const BottomNav = (): JSX.Element => {
   ).find((channel) => channel.role === Protobuf.Channel_Role.PRIMARY)?.settings;
 
   return (
-    <div className="z-20 flex justify-between divide-x divide-gray-300 border-t border-gray-300 bg-white dark:divide-gray-600 dark:border-gray-600 dark:bg-secondaryDark">
+    <div className="z-20 flex justify-between divide-x divide-gray-400 border-t border-gray-400 bg-white dark:divide-gray-600 dark:border-gray-600 dark:bg-secondaryDark">
       <BottomNavItem tooltip="Meshtastic WebUI">
         <img
           title="Logo"
diff --git a/src/components/menu/BottomNavItem.tsx b/src/components/menu/BottomNavItem.tsx
index 8b48f5b9..d7b5191d 100644
--- a/src/components/menu/BottomNavItem.tsx
+++ b/src/components/menu/BottomNavItem.tsx
@@ -21,7 +21,7 @@ export const BottomNavItem = ({
     <Tooltip disabled={!tooltip} content={tooltip}>
       <div
         onClick={onClick}
-        className={`group flex h-full cursor-pointer select-none p-1 hover:bg-gray-200 dark:text-white dark:hover:bg-primaryDark ${className}`}
+        className={`group flex h-full cursor-pointer select-none p-1 hover:bg-gray-300 dark:text-white dark:hover:bg-primaryDark ${className}`}
       >
         <m.div className="flex w-full gap-1" whileTap={{ scale: 0.99 }}>
           {children}
diff --git a/src/pages/Map/styles.ts b/src/core/mapStyles.ts
similarity index 94%
rename from src/pages/Map/styles.ts
rename to src/core/mapStyles.ts
index b86ec7d1..d1a6f706 100644
--- a/src/pages/Map/styles.ts
+++ b/src/core/mapStyles.ts
@@ -28,7 +28,7 @@ export const MapStyles: MapStyleType = {
 
   Light: {
     title: 'Light',
-    data: 'mapbox://styles/mapbox/light-v10?optimize=true',
+    data: 'mapbox://styles/sachaw/cl03ij03g001414l20w0w0ivj?optimize=true',
   } as MapStyle,
   Dark: {
     title: 'Dark',
diff --git a/src/pages/Extensions/FileBrowser.tsx b/src/pages/Extensions/FileBrowser.tsx
index 38ec460d..c9774b46 100644
--- a/src/pages/Extensions/FileBrowser.tsx
+++ b/src/pages/Extensions/FileBrowser.tsx
@@ -71,7 +71,7 @@ export const FileBrowser = (): JSX.Element => {
           {data?.data.files.map((file) => (
             <div
               key={file.name}
-              className="flex h-10 w-full border-b border-gray-300 px-4 font-medium dark:border-gray-600 dark:text-white"
+              className="flex h-10 w-full border-b border-gray-400 px-4 font-medium dark:border-gray-600 dark:text-white"
             >
               <div className="my-auto  w-1/3">
                 <a
diff --git a/src/pages/Extensions/Info.tsx b/src/pages/Extensions/Info.tsx
index 70bbe297..52a488cc 100644
--- a/src/pages/Extensions/Info.tsx
+++ b/src/pages/Extensions/Info.tsx
@@ -1,10 +1,11 @@
 import type React from 'react';
 
-import { FiClipboard, FiRefreshCw } from 'react-icons/fi';
+import { FiRefreshCw } from 'react-icons/fi';
 import JSONPretty from 'react-json-pretty';
 
 import { IconButton } from '@app/components/generic/button/IconButton';
 import { Card } from '@app/components/generic/Card';
+import { CopyButton } from '@app/components/menu/buttons/CopyButton';
 import { Hashicon } from '@emeraldpay/hashicon-react';
 import { useAppSelector } from '@hooks/useAppSelector';
 
@@ -40,7 +41,7 @@ export const Info = (): JSX.Element => {
       <Card
         title="Debug Information"
         className="flex-grow"
-        actions={<IconButton icon={<FiClipboard />} />}
+        actions={<CopyButton data={JSON.stringify(hardwareInfo)} />}
       >
         <JSONPretty className="overflow-y-auto" data={hardwareInfo} />
       </Card>
diff --git a/src/pages/Extensions/Logs.tsx b/src/pages/Extensions/Logs.tsx
index e4e4fdfa..72cca889 100644
--- a/src/pages/Extensions/Logs.tsx
+++ b/src/pages/Extensions/Logs.tsx
@@ -87,21 +87,13 @@ export const Logs = (): JSX.Element => {
               )}
 
               {meshtasticState.logs.map((log, index) => (
-                // <ContextMenu
-                //   key={index}
-                //   items={
-                //     <>
-                //       <ContextItem title="Test" icon={<FiGitBranch />} />
-                //     </>
-                //   }
-                // >
                 <m.tr
                   key={index}
                   initial={{ opacity: 0 }}
                   animate={{ opacity: 1 }}
                   exit={{ opacity: 0 }}
                   transition={{ duration: 0.3 }}
-                  className="group hover:bg-gray-200 dark:hover:bg-secondaryDark"
+                  className="group hover:bg-gray-300 dark:hover:bg-secondaryDark"
                 >
                   <m.td
                     className="w-6 cursor-pointer"
diff --git a/src/pages/Map/MapContainer.tsx b/src/pages/Map/MapContainer.tsx
index 5fea9671..ad566d3b 100644
--- a/src/pages/Map/MapContainer.tsx
+++ b/src/pages/Map/MapContainer.tsx
@@ -5,6 +5,8 @@ import { FaDirections, FaGlobeAfrica, FaMountain } from 'react-icons/fa';
 import { MdFullscreen, MdRadar, MdWbShade } from 'react-icons/md';
 
 import { IconButton } from '@components/generic/button/IconButton';
+import type { MapStyle } from '@core/mapStyles';
+import { MapStyles } from '@core/mapStyles';
 import {
   setExaggeration,
   setHillShade,
@@ -13,8 +15,6 @@ import {
 import { useAppDispatch } from '@hooks/useAppDispatch';
 import { useAppSelector } from '@hooks/useAppSelector';
 import { useMapbox } from '@hooks/useMapbox';
-import type { MapStyle } from '@pages/Map/styles';
-import { MapStyles } from '@pages/Map/styles';
 
 export const MapContainer = (): JSX.Element => {
   const dispatch = useAppDispatch();
@@ -46,7 +46,7 @@ export const MapContainer = (): JSX.Element => {
         e.stopPropagation();
       }}
     >
-      <div className="absolute right-0 z-10 m-4 space-y-2 rounded-md border border-gray-300 bg-white p-2 shadow-md dark:border-gray-600 dark:bg-primaryDark">
+      <div className="absolute right-0 z-10 m-4 space-y-2 rounded-md border border-gray-400 bg-white p-2 shadow-md dark:border-gray-600 dark:bg-primaryDark">
         <IconButton
           active={mapState.style === 'Satellite'}
           onClick={(): void => {
@@ -56,7 +56,7 @@ export const MapContainer = (): JSX.Element => {
         />
 
         <div
-          className={`-m-1 space-y-2 rounded-md border-gray-300 p-1 dark:border-gray-600 ${
+          className={`-m-1 space-y-2 rounded-md border-gray-400 p-1 dark:border-gray-600 ${
             mapState.style === 'Outdoors' ? 'border' : ''
           }`}
         >
diff --git a/src/pages/Messages/ChannelChat.tsx b/src/pages/Messages/ChannelChat.tsx
index e3d19385..c614fec0 100644
--- a/src/pages/Messages/ChannelChat.tsx
+++ b/src/pages/Messages/ChannelChat.tsx
@@ -50,7 +50,7 @@ export const ChannelChat = ({
             : `CH: ${channel.index}`
         }
       >
-        <div className="flex h-8 w-8 rounded-full bg-gray-200 dark:bg-primaryDark dark:text-white">
+        <div className="flex h-8 w-8 rounded-full bg-gray-300 dark:bg-primaryDark dark:text-white">
           <div className="m-auto">
             {channel.role === Protobuf.Channel_Role.PRIMARY ? (
               <MdPublic />
diff --git a/src/pages/Messages/Message.tsx b/src/pages/Messages/Message.tsx
index 6b0ff1bd..312473ea 100644
--- a/src/pages/Messages/Message.tsx
+++ b/src/pages/Messages/Message.tsx
@@ -22,7 +22,7 @@ export const Message = ({
   sender,
 }: MessageProps): JSX.Element => {
   return (
-    <div className="group mb-3 hover:bg-gray-200 dark:hover:bg-primaryDark">
+    <div className="group mb-3 hover:bg-gray-200 dark:hover:bg-tertiaryDark">
       {lastMsgSameUser ? (
         <div
           className={`mx-6 -mt-3 flex justify-between ${
diff --git a/src/pages/Messages/MessageBar.tsx b/src/pages/Messages/MessageBar.tsx
index 90aaeeb5..03281ef4 100644
--- a/src/pages/Messages/MessageBar.tsx
+++ b/src/pages/Messages/MessageBar.tsx
@@ -55,7 +55,7 @@ export const MessageBar = ({ chatIndex }: MessageBarProps): JSX.Element => {
     }
   };
   return (
-    <div className="mx-auto flex w-full space-x-2 bg-gray-50 p-3 text-gray-500 dark:bg-transparent dark:text-gray-400">
+    <div className="mx-auto flex w-full space-x-2 bg-gray-50 bg-transparent p-3 text-gray-500 dark:text-gray-400">
       <div className="mx-auto flex w-full max-w-4xl">
         <form
           className="flex w-full space-x-2"
diff --git a/src/pages/Messages/index.tsx b/src/pages/Messages/index.tsx
index 7cb8d91b..fa01d832 100644
--- a/src/pages/Messages/index.tsx
+++ b/src/pages/Messages/index.tsx
@@ -49,7 +49,7 @@ export const Messages = (): JSX.Element => {
               />
             ))}
           {nodes.length !== 0 && channels.length !== 0 && (
-            <div className="mx-2 rounded-md border-2 border-gray-300 dark:border-gray-600" />
+            <div className="mx-2 border-b border-gray-400 dark:border-gray-600" />
           )}
           {nodes
             .filter((node) => node.number !== myNodeNum)
@@ -65,7 +65,7 @@ export const Messages = (): JSX.Element => {
       }
     >
       <div className="flex w-full flex-col">
-        <div className="flex w-full justify-between border-b border-gray-300 px-2 dark:border-gray-600 dark:text-gray-300">
+        <div className="flex w-full justify-between border-b border-gray-400 px-2 dark:border-gray-600 dark:text-gray-300">
           <div className="my-auto flex gap-2 py-2 text-sm">
             <IconButton nested icon={<FiHash className="h-4 w-4" />} />
             <div className="my-auto">
@@ -90,7 +90,7 @@ export const Messages = (): JSX.Element => {
         </div>
         <div
           ref={chatRef}
-          className="flex flex-grow flex-col space-y-2 overflow-y-auto border-b border-gray-300 bg-white pb-6 dark:border-gray-600 dark:bg-secondaryDark"
+          className="flex flex-grow flex-col space-y-2 overflow-y-auto border-b border-gray-400 bg-gray-300 pb-6 dark:border-gray-600 dark:bg-secondaryDark"
         >
           <div className="mt-auto">
             {chats[selectedChatIndex]?.messages.map((message, index) => (
diff --git a/src/pages/Nodes/NodeCard.tsx b/src/pages/Nodes/NodeCard.tsx
index d5993456..34758b63 100644
--- a/src/pages/Nodes/NodeCard.tsx
+++ b/src/pages/Nodes/NodeCard.tsx
@@ -145,7 +145,7 @@ export const NodeCard = ({
         </CollapsibleSection>
         <CollapsibleSection title="Location" icon={<FiMapPin />}>
           <>
-            <div className="flex h-10 select-none justify-between rounded-md border border-gray-300 bg-transparent bg-gray-200 px-1 text-gray-500 dark:border-gray-600 dark:bg-secondaryDark dark:text-gray-400 ">
+            <div className="flex h-10 select-none justify-between rounded-md border border-gray-400 bg-transparent bg-gray-300 px-1 text-gray-500 dark:border-gray-600 dark:bg-secondaryDark dark:text-gray-400 ">
               {node.currentPosition ? (
                 <>
                   <div className="my-auto px-1">
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index b91eec88..094e4b45 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -13,7 +13,7 @@ module.exports = {
         primary: '#67ea94',
         primaryDark: '#25262C',
         secondaryDark: '#1C1D23',
-        accentDark: '25262C',
+        tertiaryDark: '#323438',
       },
       boxShadow: {
         border: '0 0 0 1px #67ea94',