diff --git a/gameyfin/components.json b/gameyfin/components.json
deleted file mode 100644
index 61a1078..0000000
--- a/gameyfin/components.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "new-york",
-  "rsc": false,
-  "tsx": true,
-  "tailwind": {
-    "config": "tailwind.config.js",
-    "css": "src/main/frontend/main.css",
-    "baseColor": "slate",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils"
-  }
-}
\ No newline at end of file
diff --git a/gameyfin/nextui.ts b/gameyfin/nextui.ts
index a3da6e3..cbbf6ee 100644
--- a/gameyfin/nextui.ts
+++ b/gameyfin/nextui.ts
@@ -1,7 +1,7 @@
-import {NextUIPluginConfig} from "@heroui/react";
+import {HeroUIPluginConfig} from "@heroui/react";
 import {compileThemes, themes} from "./src/main/frontend/theming/themes"
 
-export const NextUIConfig: NextUIPluginConfig = {
+export const HeroUIConfig: HeroUIPluginConfig = {
     prefix: "gf",
     themes: compileThemes(themes)
 };
\ No newline at end of file
diff --git a/gameyfin/package-lock.json b/gameyfin/package-lock.json
index 4817e5d..121b401 100644
--- a/gameyfin/package-lock.json
+++ b/gameyfin/package-lock.json
@@ -12,6 +12,7 @@
         "@material-tailwind/react": "^2.1.10",
         "@phosphor-icons/react": "^2.1.7",
         "@polymer/polymer": "3.5.2",
+        "@react-types/shared": "^3.28.0",
         "@vaadin/bundles": "24.6.6",
         "@vaadin/common-frontend": "0.0.19",
         "@vaadin/hilla-file-router": "24.6.6",
@@ -29,25 +30,21 @@
         "@vaadin/vaadin-material-styles": "24.6.6",
         "@vaadin/vaadin-themable-mixin": "24.6.6",
         "@vaadin/vaadin-usage-statistics": "2.1.3",
-        "class-variance-authority": "^0.7.0",
         "classnames": "^2.5.1",
-        "clsx": "^2.1.1",
         "construct-style-sheets-polyfill": "3.1.0",
         "cron-validator": "^1.3.1",
         "date-fns": "2.29.3",
         "formik": "^2.4.6",
-        "framer-motion": "^11.15.0",
+        "framer-motion": "^12.5.0",
         "http-status-codes": "^2.3.0",
         "lit": "3.2.1",
         "moment": "^2.30.1",
-        "moment-timezone": "^0.5.45",
-        "next-themes": "^0.4.4",
+        "moment-timezone": "^0.5.47",
+        "next-themes": "^0.4.6",
         "react": "18.3.1",
         "react-confetti-boom": "^1.0.0",
         "react-dom": "18.3.1",
         "react-router-dom": "6.29.0",
-        "sonner": "^1.7.1",
-        "tailwind-merge": "^2.5.2",
         "yup": "^1.6.1"
       },
       "devDependencies": {
@@ -2598,15 +2595,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/accordion/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/alert": {
       "version": "2.2.16",
       "resolved": "https://registry.npmjs.org/@heroui/alert/-/alert-2.2.16.tgz",
@@ -2645,15 +2633,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/alert/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/aria-utils": {
       "version": "2.2.13",
       "resolved": "https://registry.npmjs.org/@heroui/aria-utils/-/aria-utils-2.2.13.tgz",
@@ -2731,15 +2710,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/aria-utils/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/autocomplete": {
       "version": "2.3.17",
       "resolved": "https://registry.npmjs.org/@heroui/autocomplete/-/autocomplete-2.3.17.tgz",
@@ -3555,15 +3525,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/autocomplete/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/autocomplete/node_modules/@react-types/textfield": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/@react-types/textfield/-/textfield-3.12.0.tgz",
@@ -3648,15 +3609,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/avatar/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/badge": {
       "version": "2.2.10",
       "resolved": "https://registry.npmjs.org/@heroui/badge/-/badge-2.2.10.tgz",
@@ -3890,15 +3842,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/breadcrumbs/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/button": {
       "version": "2.2.16",
       "resolved": "https://registry.npmjs.org/@heroui/button/-/button-2.2.16.tgz",
@@ -4099,15 +4042,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/button/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/calendar": {
       "version": "2.2.16",
       "resolved": "https://registry.npmjs.org/@heroui/calendar/-/calendar-2.2.16.tgz",
@@ -4304,15 +4238,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/calendar/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/card": {
       "version": "2.2.15",
       "resolved": "https://registry.npmjs.org/@heroui/card/-/card-2.2.15.tgz",
@@ -4511,15 +4436,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/card/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/checkbox": {
       "version": "2.3.15",
       "resolved": "https://registry.npmjs.org/@heroui/checkbox/-/checkbox-2.3.15.tgz",
@@ -4780,15 +4696,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/checkbox/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/chip": {
       "version": "2.2.12",
       "resolved": "https://registry.npmjs.org/@heroui/chip/-/chip-2.2.12.tgz",
@@ -4874,15 +4781,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/chip/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/code": {
       "version": "2.2.12",
       "resolved": "https://registry.npmjs.org/@heroui/code/-/code-2.2.12.tgz",
@@ -5236,15 +5134,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/date-input/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/date-picker": {
       "version": "2.3.16",
       "resolved": "https://registry.npmjs.org/@heroui/date-picker/-/date-picker-2.3.16.tgz",
@@ -5591,15 +5480,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/date-picker/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/divider": {
       "version": "2.2.11",
       "resolved": "https://registry.npmjs.org/@heroui/divider/-/divider-2.2.11.tgz",
@@ -5617,15 +5497,6 @@
         "react-dom": ">=18 || >=19.0.0-rc.0"
       }
     },
-    "node_modules/@heroui/divider/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/dom-animation": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/@heroui/dom-animation/-/dom-animation-2.1.6.tgz",
@@ -6062,15 +5933,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/dropdown/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/form": {
       "version": "2.1.15",
       "resolved": "https://registry.npmjs.org/@heroui/form/-/form-2.1.15.tgz",
@@ -6136,15 +5998,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/form/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/framer-utils": {
       "version": "2.1.12",
       "resolved": "https://registry.npmjs.org/@heroui/framer-utils/-/framer-utils-2.1.12.tgz",
@@ -6329,15 +6182,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/input-otp/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/input-otp/node_modules/@react-types/textfield": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/@react-types/textfield/-/textfield-3.12.0.tgz",
@@ -6521,15 +6365,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/input/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/input/node_modules/@react-types/textfield": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/@react-types/textfield/-/textfield-3.12.0.tgz",
@@ -6577,15 +6412,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/kbd/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/link": {
       "version": "2.2.13",
       "resolved": "https://registry.npmjs.org/@heroui/link/-/link-2.2.13.tgz",
@@ -6707,15 +6533,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/link/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/listbox": {
       "version": "2.3.15",
       "resolved": "https://registry.npmjs.org/@heroui/listbox/-/listbox-2.3.15.tgz",
@@ -7021,15 +6838,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/listbox/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/listbox/node_modules/@tanstack/react-virtual": {
       "version": "3.11.3",
       "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.11.3.tgz",
@@ -7501,15 +7309,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/menu/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/modal": {
       "version": "2.2.13",
       "resolved": "https://registry.npmjs.org/@heroui/modal/-/modal-2.2.13.tgz",
@@ -7770,15 +7569,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/modal/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/navbar": {
       "version": "2.2.14",
       "resolved": "https://registry.npmjs.org/@heroui/navbar/-/navbar-2.2.14.tgz",
@@ -8080,15 +7870,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/navbar/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/number-input": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@heroui/number-input/-/number-input-2.0.6.tgz",
@@ -8212,15 +7993,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/number-input/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/pagination": {
       "version": "2.2.14",
       "resolved": "https://registry.npmjs.org/@heroui/pagination/-/pagination-2.2.14.tgz",
@@ -8326,15 +8098,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/pagination/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/popover": {
       "version": "2.3.16",
       "resolved": "https://registry.npmjs.org/@heroui/popover/-/popover-2.3.16.tgz",
@@ -8595,15 +8358,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/popover/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/progress": {
       "version": "2.2.12",
       "resolved": "https://registry.npmjs.org/@heroui/progress/-/progress-2.2.12.tgz",
@@ -8735,15 +8489,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/progress/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/radio": {
       "version": "2.3.15",
       "resolved": "https://registry.npmjs.org/@heroui/radio/-/radio-2.3.15.tgz",
@@ -9032,15 +8777,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/radio/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/react": {
       "version": "2.7.5",
       "resolved": "https://registry.npmjs.org/@heroui/react/-/react-2.7.5.tgz",
@@ -9177,15 +8913,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/react/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/ripple": {
       "version": "2.2.12",
       "resolved": "https://registry.npmjs.org/@heroui/ripple/-/ripple-2.2.12.tgz",
@@ -9462,15 +9189,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/select/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/select/node_modules/@tanstack/react-virtual": {
       "version": "3.11.3",
       "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.11.3.tgz",
@@ -9719,15 +9437,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/slider/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/snippet": {
       "version": "2.2.17",
       "resolved": "https://registry.npmjs.org/@heroui/snippet/-/snippet-2.2.17.tgz",
@@ -9821,15 +9530,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/snippet/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/spacer": {
       "version": "2.2.12",
       "resolved": "https://registry.npmjs.org/@heroui/spacer/-/spacer-2.2.12.tgz",
@@ -9999,15 +9699,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/switch/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/system": {
       "version": "2.4.12",
       "resolved": "https://registry.npmjs.org/@heroui/system/-/system-2.4.12.tgz",
@@ -10043,13 +9734,13 @@
         "react": ">=18 || >=19.0.0-rc.0"
       }
     },
-    "node_modules/@heroui/system-rsc/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "node_modules/@heroui/system-rsc/node_modules/clsx": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/@heroui/system/node_modules/@internationalized/date": {
@@ -10292,15 +9983,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/system/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/table": {
       "version": "2.2.15",
       "resolved": "https://registry.npmjs.org/@heroui/table/-/table-2.2.15.tgz",
@@ -10544,15 +10226,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/table/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/table/node_modules/@react-types/table": {
       "version": "3.11.0",
       "resolved": "https://registry.npmjs.org/@react-types/table/-/table-3.11.0.tgz",
@@ -10856,15 +10529,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/tabs/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/tabs/node_modules/@react-types/tabs": {
       "version": "3.3.13",
       "resolved": "https://registry.npmjs.org/@react-types/tabs/-/tabs-3.3.13.tgz",
@@ -10896,6 +10560,15 @@
         "tailwindcss": ">=3.4.0"
       }
     },
+    "node_modules/@heroui/theme/node_modules/clsx": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@heroui/theme/node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -10905,6 +10578,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@heroui/theme/node_modules/tailwind-merge": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz",
+      "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/dcastil"
+      }
+    },
     "node_modules/@heroui/theme/node_modules/tailwind-variants": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-0.3.0.tgz",
@@ -10981,15 +10664,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/toast/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/tooltip": {
       "version": "2.2.13",
       "resolved": "https://registry.npmjs.org/@heroui/tooltip/-/tooltip-2.2.13.tgz",
@@ -11296,15 +10970,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/tooltip/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/tooltip/node_modules/@react-types/tooltip": {
       "version": "3.4.15",
       "resolved": "https://registry.npmjs.org/@react-types/tooltip/-/tooltip-3.4.15.tgz",
@@ -11588,15 +11253,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-aria-accordion/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-aria-button": {
       "version": "2.2.10",
       "resolved": "https://registry.npmjs.org/@heroui/use-aria-button/-/use-aria-button-2.2.10.tgz",
@@ -11678,15 +11334,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-aria-button/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-aria-link": {
       "version": "2.2.11",
       "resolved": "https://registry.npmjs.org/@heroui/use-aria-link/-/use-aria-link-2.2.11.tgz",
@@ -11768,15 +11415,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-aria-link/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-aria-modal-overlay": {
       "version": "2.2.9",
       "resolved": "https://registry.npmjs.org/@heroui/use-aria-modal-overlay/-/use-aria-modal-overlay-2.2.9.tgz",
@@ -12023,15 +11661,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-aria-modal-overlay/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-aria-multiselect": {
       "version": "2.4.9",
       "resolved": "https://registry.npmjs.org/@heroui/use-aria-multiselect/-/use-aria-multiselect-2.4.9.tgz",
@@ -12520,15 +12149,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-aria-multiselect/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-callback-ref": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/@heroui/use-callback-ref/-/use-callback-ref-2.1.6.tgz",
@@ -12594,15 +12214,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-disclosure/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-draggable": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/@heroui/use-draggable/-/use-draggable-2.1.8.tgz",
@@ -12650,15 +12261,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-draggable/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-image": {
       "version": "2.1.7",
       "resolved": "https://registry.npmjs.org/@heroui/use-image/-/use-image-2.1.7.tgz",
@@ -12722,15 +12324,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-intersection-observer/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-is-mobile": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/@heroui/use-is-mobile/-/use-is-mobile-2.2.7.tgz",
@@ -12821,15 +12414,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/use-pagination/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@heroui/use-safe-layout-effect": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/@heroui/use-safe-layout-effect/-/use-safe-layout-effect-2.1.6.tgz",
@@ -12946,15 +12530,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@heroui/user/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@internationalized/message": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/@internationalized/message/-/message-3.1.6.tgz",
@@ -13130,6 +12705,12 @@
         "react-dom": "^16 || ^17 || ^18"
       }
     },
+    "node_modules/@material-tailwind/react/node_modules/tailwind-merge": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.8.1.tgz",
+      "integrity": "sha512-+fflfPxvHFr81hTJpQ3MIwtqgvefHZFUHFiIHpVIRXvG/nX9+gu2P7JNlFu2bfDMJ+uHhi/pUgzaYacMoXv+Ww==",
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -13415,15 +12996,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-aria/grid/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-aria/landmark": {
       "version": "3.0.0-beta.18",
       "resolved": "https://registry.npmjs.org/@react-aria/landmark/-/landmark-3.0.0-beta.18.tgz",
@@ -13458,15 +13030,6 @@
         "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-aria/landmark/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-aria/live-announcer": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/@react-aria/live-announcer/-/live-announcer-3.4.1.tgz",
@@ -13641,15 +13204,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-aria/numberfield/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-aria/numberfield/node_modules/@react-types/textfield": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/@react-types/textfield/-/textfield-3.12.0.tgz",
@@ -13739,15 +13293,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-aria/spinbutton/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-aria/ssr": {
       "version": "3.9.7",
       "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.7.tgz",
@@ -13859,15 +13404,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-aria/toast/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-aria/toggle": {
       "version": "3.11.1",
       "resolved": "https://registry.npmjs.org/@react-aria/toggle/-/toggle-3.11.1.tgz",
@@ -13948,15 +13484,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-aria/toggle/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-stately/flags": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@react-stately/flags/-/flags-3.1.0.tgz",
@@ -14007,15 +13534,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-stately/grid/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-stately/numberfield": {
       "version": "3.9.10",
       "resolved": "https://registry.npmjs.org/@react-stately/numberfield/-/numberfield-3.9.10.tgz",
@@ -14045,15 +13563,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-stately/numberfield/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-stately/select": {
       "version": "3.6.11",
       "resolved": "https://registry.npmjs.org/@react-stately/select/-/select-3.6.11.tgz",
@@ -14151,15 +13660,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-stately/select/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-stately/selection": {
       "version": "3.20.0",
       "resolved": "https://registry.npmjs.org/@react-stately/selection/-/selection-3.20.0.tgz",
@@ -14188,15 +13688,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-stately/selection/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-stately/toast": {
       "version": "3.0.0-beta.7",
       "resolved": "https://registry.npmjs.org/@react-stately/toast/-/toast-3.0.0-beta.7.tgz",
@@ -14247,15 +13738,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-types/dialog/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-types/listbox": {
       "version": "3.5.5",
       "resolved": "https://registry.npmjs.org/@react-types/listbox/-/listbox-3.5.5.tgz",
@@ -14268,15 +13750,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-types/listbox/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-types/numberfield": {
       "version": "3.8.9",
       "resolved": "https://registry.npmjs.org/@react-types/numberfield/-/numberfield-3.8.9.tgz",
@@ -14289,7 +13762,7 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-types/numberfield/node_modules/@react-types/shared": {
+    "node_modules/@react-types/shared": {
       "version": "3.28.0",
       "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
       "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
@@ -14310,15 +13783,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-types/slider/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@react-types/switch": {
       "version": "3.5.9",
       "resolved": "https://registry.npmjs.org/@react-types/switch/-/switch-3.5.9.tgz",
@@ -14331,15 +13795,6 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
-    "node_modules/@react-types/switch/node_modules/@react-types/shared": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.28.0.tgz",
-      "integrity": "sha512-9oMEYIDc3sk0G5rysnYvdNrkSg7B04yTKl50HHSZVbokeHpnU0yRmsDaWb9B/5RprcKj8XszEk5guBO8Sa/Q+Q==",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
-      }
-    },
     "node_modules/@remix-run/router": {
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.22.0.tgz",
@@ -17829,18 +17284,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/class-variance-authority": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
-      "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "clsx": "^2.1.1"
-      },
-      "funding": {
-        "url": "https://polar.sh/cva"
-      }
-    },
     "node_modules/classnames": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
@@ -18860,13 +18303,13 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "11.15.0",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.15.0.tgz",
-      "integrity": "sha512-MLk8IvZntxOMg7lDBLw2qgTHHv664bYoYmnFTmE0Gm/FW67aOJk0WM3ctMcG+Xhcv+vh5uyyXwxvxhSeJzSe+w==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.5.0.tgz",
+      "integrity": "sha512-buPlioFbH9/W7rDzYh1C09AuZHAk2D1xTA1BlounJ2Rb9aRg84OXexP0GLd+R83v0khURdMX7b5MKnGTaSg5iA==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^11.14.3",
-        "motion-utils": "^11.14.3",
+        "motion-dom": "^12.5.0",
+        "motion-utils": "^12.5.0",
         "tslib": "^2.4.0"
       },
       "peerDependencies": {
@@ -20591,9 +20034,9 @@
       }
     },
     "node_modules/moment-timezone": {
-      "version": "0.5.46",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz",
-      "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
+      "version": "0.5.47",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz",
+      "integrity": "sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==",
       "license": "MIT",
       "dependencies": {
         "moment": "^2.29.4"
@@ -20603,15 +20046,18 @@
       }
     },
     "node_modules/motion-dom": {
-      "version": "11.14.3",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.14.3.tgz",
-      "integrity": "sha512-lW+D2wBy5vxLJi6aCP0xyxTxlTfiu+b+zcpVbGVFUxotwThqhdpPRSmX8xztAgtZMPMeU0WGVn/k1w4I+TbPqA==",
-      "license": "MIT"
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.5.0.tgz",
+      "integrity": "sha512-uH2PETDh7m+Hjd1UQQ56yHqwn83SAwNjimNPE/kC+Kds0t4Yh7+29rfo5wezVFpPOv57U4IuWved5d1x0kNhbQ==",
+      "license": "MIT",
+      "dependencies": {
+        "motion-utils": "^12.5.0"
+      }
     },
     "node_modules/motion-utils": {
-      "version": "11.14.3",
-      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.14.3.tgz",
-      "integrity": "sha512-Xg+8xnqIJTpr0L/cidfTTBFkvRw26ZtGGuIhA94J9PQ2p4mEa06Xx7QVYZH0BP+EpMSaDlu+q0I0mmvwADPsaQ==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.5.0.tgz",
+      "integrity": "sha512-+hFFzvimn0sBMP9iPxBa9OtRX35ZQ3py0UHnb8U29VD+d8lQ8zH3dTygJWqK7av2v6yhg7scj9iZuvTS0f4+SA==",
       "license": "MIT"
     },
     "node_modules/ms": {
@@ -20678,9 +20124,9 @@
       }
     },
     "node_modules/next-themes": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.4.4.tgz",
-      "integrity": "sha512-LDQ2qIOJF0VnuVrrMSMLrWGjRMkq+0mpgl6e0juCLqdJ+oo8Q84JRWT6Wh11VDQKkMMe+dVzDKLWs5n87T+PkQ==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.4.6.tgz",
+      "integrity": "sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==",
       "license": "MIT",
       "peerDependencies": {
         "react": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc",
@@ -22229,16 +21675,6 @@
         "atomic-sleep": "^1.0.0"
       }
     },
-    "node_modules/sonner": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.1.tgz",
-      "integrity": "sha512-b6LHBfH32SoVasRFECrdY8p8s7hXPDn3OHUFbZZbiB1ctLS9Gdh6rpX2dVrpQA0kiL5jcRzDDldwwLkSKk3+QQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
-        "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
-      }
-    },
     "node_modules/source-map": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
@@ -22666,16 +22102,6 @@
       "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
       "license": "MIT"
     },
-    "node_modules/tailwind-merge": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.5.tgz",
-      "integrity": "sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/dcastil"
-      }
-    },
     "node_modules/tailwindcss": {
       "version": "3.4.17",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
diff --git a/gameyfin/package.json b/gameyfin/package.json
index e515007..6f21fb5 100644
--- a/gameyfin/package.json
+++ b/gameyfin/package.json
@@ -3,10 +3,11 @@
   "version": "2.0.0-ALPHA",
   "type": "module",
   "dependencies": {
-    "@material-tailwind/react": "^2.1.10",
     "@heroui/react": "2.7.5",
+    "@material-tailwind/react": "^2.1.10",
     "@phosphor-icons/react": "^2.1.7",
     "@polymer/polymer": "3.5.2",
+    "@react-types/shared": "^3.28.0",
     "@vaadin/bundles": "24.6.6",
     "@vaadin/common-frontend": "0.0.19",
     "@vaadin/hilla-file-router": "24.6.6",
@@ -24,9 +25,7 @@
     "@vaadin/vaadin-material-styles": "24.6.6",
     "@vaadin/vaadin-themable-mixin": "24.6.6",
     "@vaadin/vaadin-usage-statistics": "2.1.3",
-    "class-variance-authority": "^0.7.0",
     "classnames": "^2.5.1",
-    "clsx": "^2.1.1",
     "construct-style-sheets-polyfill": "3.1.0",
     "cron-validator": "^1.3.1",
     "date-fns": "2.29.3",
@@ -41,8 +40,6 @@
     "react-confetti-boom": "^1.0.0",
     "react-dom": "18.3.1",
     "react-router-dom": "6.29.0",
-    "sonner": "^1.7.1",
-    "tailwind-merge": "^2.5.2",
     "yup": "^1.6.1"
   },
   "devDependencies": {
@@ -96,14 +93,10 @@
     "@phosphor-icons/react": "$@phosphor-icons/react",
     "formik": "$formik",
     "yup": "$yup",
-    "class-variance-authority": "$class-variance-authority",
-    "clsx": "$clsx",
     "next-themes": "$next-themes",
-    "tailwind-merge": "$tailwind-merge",
     "@heroui/react": "$@heroui/react",
     "framer-motion": "$framer-motion",
     "@material-tailwind/react": "$@material-tailwind/react",
-    "sonner": "$sonner",
     "http-status-codes": "$http-status-codes",
     "@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
     "@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
@@ -124,7 +117,8 @@
     "date-fns": "$date-fns",
     "@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
     "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
-    "@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles"
+    "@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
+    "@react-types/shared": "$@react-types/shared"
   },
   "vaadin": {
     "dependencies": {
@@ -184,6 +178,6 @@
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "4cb8eb38282e90ab28af32f01ad7d2f7a15758837309655a753bbc1989258d6f"
+    "hash": "3f65776fc466d9436093cb2be8081f16d86234693e52c66dcc7faf5ad0bfbee6"
   }
-}
\ No newline at end of file
+}
diff --git a/gameyfin/src/main/frontend/@/components/ui/alert.tsx b/gameyfin/src/main/frontend/@/components/ui/alert.tsx
deleted file mode 100644
index 6a9375e..0000000
--- a/gameyfin/src/main/frontend/@/components/ui/alert.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import * as React from "react"
-import {cva, type VariantProps} from "class-variance-authority"
-import {cn} from "Frontend/util/utils";
-
-const alertVariants = cva(
-    "relative w-full rounded-lg border px-4 py-3 text-sm [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7",
-    {
-        variants: {
-            variant: {
-                default: "bg-background text-foreground",
-                destructive:
-                    "border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
-            },
-        },
-        defaultVariants: {
-            variant: "default",
-        },
-    }
-)
-
-const Alert = React.forwardRef<
-    HTMLDivElement,
-    React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
->(({className, variant, ...props}, ref) => (
-    <div
-        ref={ref}
-        role="alert"
-        className={cn(alertVariants({variant}), className)}
-        {...props}
-    />
-))
-Alert.displayName = "Alert"
-
-const AlertTitle = React.forwardRef<
-    HTMLParagraphElement,
-    React.HTMLAttributes<HTMLHeadingElement>
->(({className, ...props}, ref) => (
-    <h5
-        ref={ref}
-        className={cn("mb-1 font-medium leading-none tracking-tight", className)}
-        {...props}
-    />
-))
-AlertTitle.displayName = "AlertTitle"
-
-const AlertDescription = React.forwardRef<
-    HTMLParagraphElement,
-    React.HTMLAttributes<HTMLParagraphElement>
->(({className, ...props}, ref) => (
-    <div
-        ref={ref}
-        className={cn("text-sm [&_p]:leading-relaxed", className)}
-        {...props}
-    />
-))
-AlertDescription.displayName = "AlertDescription"
-
-export {Alert, AlertTitle, AlertDescription}
diff --git a/gameyfin/src/main/frontend/@/components/ui/sonner.tsx b/gameyfin/src/main/frontend/@/components/ui/sonner.tsx
deleted file mode 100644
index c24c3d6..0000000
--- a/gameyfin/src/main/frontend/@/components/ui/sonner.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useTheme } from "next-themes"
-import { Toaster as Sonner } from "sonner"
-
-type ToasterProps = React.ComponentProps<typeof Sonner>
-
-const Toaster = ({ ...props }: ToasterProps) => {
-  const { theme = "system" } = useTheme()
-
-  return (
-    <Sonner
-      theme={theme as ToasterProps["theme"]}
-      className="toaster group"
-      toastOptions={{
-        classNames: {
-          toast:
-            "group toast group-[.toaster]:bg-content1 group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
-          description: "group-[.toast]:text-muted-foreground",
-          actionButton:
-            "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",
-          cancelButton:
-            "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",
-        },
-      }}
-      {...props}
-    />
-  )
-}
-
-export { Toaster }
diff --git a/gameyfin/src/main/frontend/App.tsx b/gameyfin/src/main/frontend/App.tsx
index de04e1f..65f5926 100644
--- a/gameyfin/src/main/frontend/App.tsx
+++ b/gameyfin/src/main/frontend/App.tsx
@@ -2,11 +2,11 @@ import {Outlet, useHref, useNavigate} from 'react-router-dom';
 import "./main.css";
 import "Frontend/util/custom-validators";
 import {HeroUIProvider} from "@heroui/react";
+import {ToastProvider} from "@heroui/toast";
 import {ThemeProvider as NextThemesProvider} from "next-themes";
 import {themeNames} from "Frontend/theming/themes";
 import {AuthProvider} from "Frontend/util/auth";
-import {IconContext} from "@phosphor-icons/react";
-import {Toaster} from "Frontend/@/components/ui/sonner";
+import {IconContext, X} from "@phosphor-icons/react";
 import client from "Frontend/generated/connect-client.default";
 import {ErrorHandlingMiddleware} from "Frontend/util/middleware";
 
@@ -21,7 +21,20 @@ export default function App() {
                 <AuthProvider>
                     <IconContext.Provider value={{size: 20}}>
                         <Outlet/>
-                        <Toaster/>
+                        <ToastProvider
+                            toastProps={{
+                                shouldShowTimeoutProgress: true,
+                                radius: "sm",
+                                variant: "flat",
+                                hideIcon: true,
+                                closeIcon: <X/>,
+                                classNames: {
+                                    closeButton: "opacity-100 absolute right-4 top-1/2 -translate-y-1/2",
+                                    progressTrack: "h-1",
+                                }
+                            }}
+                            toastOffset={64}
+                        />
                     </IconContext.Provider>
                 </AuthProvider>
             </NextThemesProvider>
diff --git a/gameyfin/src/main/frontend/components/ProfileMenu.tsx b/gameyfin/src/main/frontend/components/ProfileMenu.tsx
index 44efa25..0a39c11 100644
--- a/gameyfin/src/main/frontend/components/ProfileMenu.tsx
+++ b/gameyfin/src/main/frontend/components/ProfileMenu.tsx
@@ -67,7 +67,7 @@ export default function ProfileMenu() {
                     return (
                         <DropdownItem
                             key={label}
-                            onClick={onClick}
+                            onPress={onClick}
                             startContent={<div color={color}>{icon}</div>}
                             /* @ts-ignore */
                             color={color ? color : ""}
diff --git a/gameyfin/src/main/frontend/components/administration/LogManagement.tsx b/gameyfin/src/main/frontend/components/administration/LogManagement.tsx
index b2848b0..c96516f 100644
--- a/gameyfin/src/main/frontend/components/administration/LogManagement.tsx
+++ b/gameyfin/src/main/frontend/components/administration/LogManagement.tsx
@@ -3,8 +3,7 @@ import {LogEndpoint} from "Frontend/generated/endpoints";
 import withConfigPage from "Frontend/components/administration/withConfigPage";
 import * as Yup from 'yup';
 import ConfigFormField from "Frontend/components/administration/ConfigFormField";
-import {toast} from "sonner";
-import {Button, Code, Divider, Tooltip} from "@heroui/react";
+import {addToast, Button, Code, Divider, Tooltip} from "@heroui/react";
 import {ArrowUDownLeft, SortAscending} from "@phosphor-icons/react";
 
 function LogManagementLayout({getConfig, formik}: any) {
@@ -24,7 +23,11 @@ function LogManagementLayout({getConfig, formik}: any) {
     useEffect(() => {
         if (formik.isSubmitting == false && formik.submitCount > 0) {
             LogEndpoint.reloadLogConfig()
-                .catch(() => toast.error("Failed to apply log configuration"));
+                .catch(() => addToast({
+                    title: "Error",
+                    description: "Failed to apply log configuration",
+                    color: "danger"
+                }));
         }
     }, [formik.isSubmitting]);
 
diff --git a/gameyfin/src/main/frontend/components/administration/MessageManagement.tsx b/gameyfin/src/main/frontend/components/administration/MessageManagement.tsx
index c8e8b80..6603b08 100644
--- a/gameyfin/src/main/frontend/components/administration/MessageManagement.tsx
+++ b/gameyfin/src/main/frontend/components/administration/MessageManagement.tsx
@@ -2,9 +2,8 @@ import React, {useEffect, useState} from "react";
 import withConfigPage from "Frontend/components/administration/withConfigPage";
 import ConfigFormField from "Frontend/components/administration/ConfigFormField";
 import Section from "Frontend/components/general/Section";
-import {Button, Card, Tooltip, useDisclosure} from "@heroui/react";
+import {addToast, Button, Card, Tooltip, useDisclosure} from "@heroui/react";
 import {MessageEndpoint, MessageTemplateEndpoint} from "Frontend/generated/endpoints";
-import {toast} from "sonner";
 import {PaperPlaneRight, Pencil} from "@phosphor-icons/react";
 import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/messages/templates/MessageTemplateDto";
 import SendTestNotificationModal from "Frontend/components/administration/messages/SendTestNotificationModal";
@@ -34,9 +33,15 @@ function MessageManagementLayout({getConfig, getConfigs, formik}: any) {
         const areCredentialsValid = await MessageEndpoint.verifyCredentials(provider, credentials);
 
         if (areCredentialsValid) {
-            toast.success("Credentials are valid")
+            addToast({
+                title: "Credentials are valid",
+                color: "success"
+            });
         } else {
-            toast.error("Credentials are invalid")
+            addToast({
+                title: "Credentials are invalid",
+                color: "warning"
+            });
         }
     }
 
diff --git a/gameyfin/src/main/frontend/components/administration/ProfileManagement.tsx b/gameyfin/src/main/frontend/components/administration/ProfileManagement.tsx
index f2ccf78..d37331a 100644
--- a/gameyfin/src/main/frontend/components/administration/ProfileManagement.tsx
+++ b/gameyfin/src/main/frontend/components/administration/ProfileManagement.tsx
@@ -1,6 +1,6 @@
 import Section from "Frontend/components/general/Section";
 import Input from "Frontend/components/general/Input";
-import {Button, Input as NextUiInput, Tooltip} from "@heroui/react";
+import {addToast, Button, Input as NextUiInput, Tooltip} from "@heroui/react";
 import {Form, Formik} from "formik";
 import {ArrowCounterClockwise, Check, Info, Trash} from "@phosphor-icons/react";
 import React, {useEffect, useState} from "react";
@@ -9,7 +9,6 @@ import * as Yup from "yup";
 import UserUpdateDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserUpdateDto";
 import {EmailConfirmationEndpoint, MessageEndpoint, UserEndpoint} from "Frontend/generated/endpoints";
 import {SmallInfoField} from "Frontend/components/general/SmallInfoField";
-import {toast} from "sonner";
 import {removeAvatar, uploadAvatar} from "Frontend/endpoints/AvatarEndpoint";
 import Avatar from "Frontend/components/general/Avatar";
 
@@ -48,8 +47,10 @@ export default function ProfileManagement() {
         setConfigSaved(true);
 
         if (values.newPassword.length > 0) {
-            toast.success("Password changed", {
-                description: "Please log in again"
+            addToast({
+                title: "Password changed",
+                description: "Please log in again",
+                color: "success"
             });
             setTimeout(() => {
                 auth.logout();
@@ -133,7 +134,11 @@ export default function ProfileManagement() {
                                             <Button isIconOnly
                                                     onPress={() => {
                                                         EmailConfirmationEndpoint.resendEmailConfirmation().then(
-                                                            () => toast.success("You will receive an email shortly")
+                                                            () => addToast({
+                                                                title: "Email confirmation message sent",
+                                                                description: "Please check your inbox",
+                                                                color: "success"
+                                                            })
                                                         )
                                                     }}
                                                     isDisabled={!messagesEnabled}
diff --git a/gameyfin/src/main/frontend/components/administration/SsoManagement.tsx b/gameyfin/src/main/frontend/components/administration/SsoManagement.tsx
index 14c0242..3477b71 100644
--- a/gameyfin/src/main/frontend/components/administration/SsoManagement.tsx
+++ b/gameyfin/src/main/frontend/components/administration/SsoManagement.tsx
@@ -3,9 +3,8 @@ import withConfigPage from "Frontend/components/administration/withConfigPage";
 import * as Yup from 'yup';
 import ConfigFormField from "Frontend/components/administration/ConfigFormField";
 import Section from "Frontend/components/general/Section";
-import {Button} from "@heroui/react";
+import {addToast, Button} from "@heroui/react";
 import {MagicWand} from "@phosphor-icons/react";
-import {toast} from "sonner";
 
 function SsoManagementLayout({getConfig, formik, setSaveMessage}: any) {
 
@@ -35,7 +34,10 @@ function SsoManagementLayout({getConfig, formik, setSaveMessage}: any) {
             formik.setFieldValue("sso.oidc.logout-url", data.end_session_endpoint);
             formik.setFieldValue("sso.oidc.jwks-url", data.jwks_uri);
         } catch (e) {
-            toast.error("Failed to auto-populate SSO configuration");
+            addToast({
+                title: "Failed to auto-populate SSO configuration",
+                color: "warning"
+            });
         }
     }
 
diff --git a/gameyfin/src/main/frontend/components/administration/messages/EditTemplateModel.tsx b/gameyfin/src/main/frontend/components/administration/messages/EditTemplateModel.tsx
index c625b76..6e81971 100644
--- a/gameyfin/src/main/frontend/components/administration/messages/EditTemplateModel.tsx
+++ b/gameyfin/src/main/frontend/components/administration/messages/EditTemplateModel.tsx
@@ -1,5 +1,6 @@
 import React, {useEffect, useState} from "react";
 import {
+    addToast,
     Button,
     Chip,
     Link,
@@ -10,7 +11,6 @@ import {
     ModalHeader,
     Textarea
 } from "@heroui/react";
-import {toast} from "sonner";
 import {MessageTemplateEndpoint} from "Frontend/generated/endpoints";
 import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/messages/templates/MessageTemplateDto";
 import TemplateType from "Frontend/generated/de/grimsi/gameyfin/messages/templates/TemplateType";
@@ -111,7 +111,11 @@ export default function EditTemplateModal({isOpen, onOpenChange, selectedTemplat
                                     onPress={async () => {
                                         if (selectedTemplate) {
                                             await saveTemplate(selectedTemplate);
-                                            toast.success("Template saved");
+                                            addToast({
+                                                title: "Template saved",
+                                                description: "Template has been saved",
+                                                color: "success"
+                                            });
                                             onClose();
                                         }
                                     }}>
diff --git a/gameyfin/src/main/frontend/components/administration/messages/SendTestNotificationModal.tsx b/gameyfin/src/main/frontend/components/administration/messages/SendTestNotificationModal.tsx
index 3c6c9f0..3380c8d 100644
--- a/gameyfin/src/main/frontend/components/administration/messages/SendTestNotificationModal.tsx
+++ b/gameyfin/src/main/frontend/components/administration/messages/SendTestNotificationModal.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import {Form, Formik} from "formik";
-import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
-import {toast} from "sonner";
+import {addToast, Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
 import Input from "Frontend/components/general/Input";
 import {MessageEndpoint} from "Frontend/generated/endpoints";
 import * as Yup from "yup";
@@ -37,7 +36,11 @@ export default function SendTestNotificationModal({
                             isInitialValid={false}
                             onSubmit={async (values) => {
                                 await MessageEndpoint.sendTestNotification(selectedTemplate?.key, values);
-                                toast.success("Test notification to you has been sent");
+                                addToast({
+                                    title: "Notification sent",
+                                    description: "Test notification to you has been sent",
+                                    color: "success"
+                                });
                                 onClose();
                             }}
                             validationSchema={generateValidationSchema(selectedTemplate?.availablePlaceholders as string[])}
diff --git a/gameyfin/src/main/frontend/components/general/InviteUserModal.tsx b/gameyfin/src/main/frontend/components/general/InviteUserModal.tsx
index 74becc0..e89d812 100644
--- a/gameyfin/src/main/frontend/components/general/InviteUserModal.tsx
+++ b/gameyfin/src/main/frontend/components/general/InviteUserModal.tsx
@@ -1,7 +1,6 @@
 import React, {useEffect, useState} from "react";
-import {Button, Input, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
+import {addToast, Button, Input, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
 import {RegistrationEndpoint, UserEndpoint} from "Frontend/generated/endpoints";
-import {toast} from "sonner";
 
 interface InviteUserModalProps {
     isOpen: boolean;
@@ -27,7 +26,11 @@ export default function InviteUserModal({isOpen, onOpenChange}: InviteUserModalP
 
         try {
             await RegistrationEndpoint.createInvitation(email);
-            toast.success("Invitation has been sent");
+            addToast({
+                title: "Invitation sent",
+                description: "The user will receive an email with further instructions shortly.",
+                color: "success"
+            });
             onClose();
         } catch (e) {
             setError("Failed to create invitation");
diff --git a/gameyfin/src/main/frontend/components/general/PasswordResetModal.tsx b/gameyfin/src/main/frontend/components/general/PasswordResetModal.tsx
index c1f3381..5baa582 100644
--- a/gameyfin/src/main/frontend/components/general/PasswordResetModal.tsx
+++ b/gameyfin/src/main/frontend/components/general/PasswordResetModal.tsx
@@ -1,9 +1,8 @@
 import React, {useEffect, useState} from "react";
-import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
+import {addToast, Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
 import {Input as NextInput} from "@heroui/input";
 import {WarningCircle} from "@phosphor-icons/react";
 import {MessageEndpoint, PasswordResetEndpoint} from "Frontend/generated/endpoints";
-import {toast} from "sonner";
 
 interface PasswordResetModalProps {
     isOpen: boolean;
@@ -23,7 +22,11 @@ export default function PasswordResetModal({
 
     async function resetPassword() {
         await PasswordResetEndpoint.requestPasswordReset(resetEmail);
-        toast.success("If the email address is registered, you will receive a message with further instructions.");
+        addToast({
+            title: "Password reset requested",
+            description: "If the email address is registered, you will receive a message with further instructions.",
+            color: "success"
+        });
     }
 
     return (
diff --git a/gameyfin/src/main/frontend/components/general/PluginDetailsModal.tsx b/gameyfin/src/main/frontend/components/general/PluginDetailsModal.tsx
index f9a842f..e38e822 100644
--- a/gameyfin/src/main/frontend/components/general/PluginDetailsModal.tsx
+++ b/gameyfin/src/main/frontend/components/general/PluginDetailsModal.tsx
@@ -1,6 +1,5 @@
 import React, {useEffect, useState} from "react";
-import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
-import {toast} from "sonner";
+import {addToast, Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
 import {Form, Formik} from "formik";
 import {PluginConfigEndpoint, PluginManagementEndpoint} from "Frontend/generated/endpoints";
 import PluginDto from "Frontend/generated/de/grimsi/gameyfin/core/plugins/management/PluginDto";
@@ -32,7 +31,11 @@ export default function PluginDetailsModal({plugin, isOpen, onOpenChange, update
 
     async function saveConfig(values: Record<string, string>) {
         await PluginConfigEndpoint.setConfigEntries(plugin.id, values);
-        toast.success(`Configuration for ${plugin.name} saved!`);
+        addToast({
+            title: "Configuration saved",
+            description: `Configuration for plugin ${plugin.name} saved!`,
+            color: "success"
+        });
         let updatedPlugin = await PluginManagementEndpoint.getPlugin(plugin.id);
         if (updatedPlugin === undefined) return;
         updatePlugin(updatedPlugin);
diff --git a/gameyfin/src/main/frontend/components/general/SelectInput.tsx b/gameyfin/src/main/frontend/components/general/SelectInput.tsx
index b608d35..c7d8d56 100644
--- a/gameyfin/src/main/frontend/components/general/SelectInput.tsx
+++ b/gameyfin/src/main/frontend/components/general/SelectInput.tsx
@@ -17,7 +17,7 @@ const SelectInput = ({label, values, ...props}) => {
                 disallowEmptySelection
             >
                 {values.map((value: string) => (
-                    <SelectItem key={value} value={value}>
+                    <SelectItem key={value}>
                         {value}
                     </SelectItem>
                 ))}
diff --git a/gameyfin/src/main/frontend/components/general/SignUpModal.tsx b/gameyfin/src/main/frontend/components/general/SignUpModal.tsx
index eec2900..31a3b90 100644
--- a/gameyfin/src/main/frontend/components/general/SignUpModal.tsx
+++ b/gameyfin/src/main/frontend/components/general/SignUpModal.tsx
@@ -1,11 +1,10 @@
 import React from "react";
-import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
+import {addToast, Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
 import {RegistrationEndpoint} from "Frontend/generated/endpoints";
 import UserRegistrationDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserRegistrationDto";
 import {Form, Formik} from "formik";
 import * as Yup from "yup";
 import Input from "Frontend/components/general/Input";
-import {toast} from "sonner";
 
 interface SignUpModalProps {
     isOpen: boolean;
@@ -24,12 +23,20 @@ export default function SignUpModal({
                 password: registration.password,
                 email: registration.email
             });
-            
+
             onClose();
 
-            toast.success('You will receive an email with further instructions shortly.');
+            addToast({
+                title: "Account created",
+                description: "You will receive an email with further instructions shortly.",
+                color: "success"
+            });
         } catch (_) {
-            toast.error('An error occurred while registering your account.');
+            addToast({
+                title: "Registration failed",
+                description: "An error occurred while registering your account.",
+                color: "danger"
+            });
             return;
         }
     }
diff --git a/gameyfin/src/main/frontend/endpoints/AvatarEndpoint.ts b/gameyfin/src/main/frontend/endpoints/AvatarEndpoint.ts
index a1b8309..86be057 100644
--- a/gameyfin/src/main/frontend/endpoints/AvatarEndpoint.ts
+++ b/gameyfin/src/main/frontend/endpoints/AvatarEndpoint.ts
@@ -1,5 +1,5 @@
 import {fetchWithAuth} from "Frontend/util/utils";
-import {toast} from "sonner";
+import {addToast} from "@heroui/react";
 
 export async function uploadAvatar(avatar: any) {
     const formData = new FormData();
@@ -12,7 +12,11 @@ export async function uploadAvatar(avatar: any) {
     if (response.ok) {
         window.location.reload();
     } else {
-        toast.error("Error uploading avatar", {description: result});
+        addToast({
+            title: "Error uploading avatar",
+            description: result,
+            color: "danger"
+        });
     }
 }
 
@@ -24,7 +28,11 @@ export async function removeAvatar() {
     if (response.ok) {
         window.location.reload();
     } else {
-        toast.error("Error removing avatar", {description: result});
+        addToast({
+            title: "Error removing avatar",
+            description: result,
+            color: "danger"
+        });
     }
 }
 
@@ -36,6 +44,10 @@ export async function removeAvatarByName(name: string) {
     if (response.ok) {
         window.location.reload();
     } else {
-        toast.error("Error removing avatar", {description: result});
+        addToast({
+            title: "Error removing avatar",
+            description: result,
+            color: "danger"
+        });
     }
 }
\ No newline at end of file
diff --git a/gameyfin/src/main/frontend/util/middleware.ts b/gameyfin/src/main/frontend/util/middleware.ts
index 1b36d60..a72b911 100644
--- a/gameyfin/src/main/frontend/util/middleware.ts
+++ b/gameyfin/src/main/frontend/util/middleware.ts
@@ -1,5 +1,5 @@
 import {Middleware, MiddlewareContext, MiddlewareNext} from '@vaadin/hilla-frontend';
-import {toast} from "sonner";
+import {addToast} from "@heroui/react";
 import {getReasonPhrase} from "http-status-codes";
 
 export const ErrorHandlingMiddleware: Middleware = async function (
@@ -21,9 +21,17 @@ export const ErrorHandlingMiddleware: Middleware = async function (
         let json: any = await response.json();
 
         if (json.type == "dev.hilla.exception.EndpointException") {
-            toast.error(`${getReasonPhrase(response.status)}`, {description: `${json.message}`});
+            addToast({
+                title: getReasonPhrase(response.status),
+                description: json.message,
+                color: "danger"
+            })
         } else {
-            toast.error(`${getReasonPhrase(response.status)}`, {description: `${endpoint}.${method}`})
+            addToast({
+                title: getReasonPhrase(response.status),
+                description: `${endpoint}.${method}`,
+                color: "danger"
+            })
         }
     }
 
diff --git a/gameyfin/src/main/frontend/util/utils.ts b/gameyfin/src/main/frontend/util/utils.ts
index 0f271b1..dec4cda 100644
--- a/gameyfin/src/main/frontend/util/utils.ts
+++ b/gameyfin/src/main/frontend/util/utils.ts
@@ -1,12 +1,6 @@
-import {type ClassValue, clsx} from "clsx"
-import {twMerge} from "tailwind-merge"
 import {getCsrfToken} from "Frontend/util/auth";
 import moment from 'moment-timezone';
 
-export function cn(...inputs: ClassValue[]) {
-    return twMerge(clsx(inputs))
-}
-
 export function cssVar(variable: string) {
     return getComputedStyle(document.documentElement).getPropertyValue(`--${variable}`);
 }
diff --git a/gameyfin/src/main/frontend/views/InvitationRegistrationView.tsx b/gameyfin/src/main/frontend/views/InvitationRegistrationView.tsx
index b3e510d..ca516c9 100644
--- a/gameyfin/src/main/frontend/views/InvitationRegistrationView.tsx
+++ b/gameyfin/src/main/frontend/views/InvitationRegistrationView.tsx
@@ -1,4 +1,4 @@
-import {Button, Card, CardBody, CardHeader} from "@heroui/react";
+import {addToast, Button, Card, CardBody, CardHeader} from "@heroui/react";
 import {useNavigate, useSearchParams} from "react-router-dom";
 import {Form, Formik} from "formik";
 import Input from "Frontend/components/general/Input";
@@ -6,7 +6,6 @@ import * as Yup from "yup";
 import {RegistrationEndpoint} from "Frontend/generated/endpoints";
 import React, {useEffect, useState} from "react";
 import {Warning} from "@phosphor-icons/react";
-import {toast} from "sonner";
 import UserInvitationAcceptanceResult
     from "Frontend/generated/de/grimsi/gameyfin/users/enums/UserInvitationAcceptanceResult";
 
@@ -33,19 +32,31 @@ export default function InvitationRegistrationView() {
 
         switch (result) {
             case UserInvitationAcceptanceResult.SUCCESS:
-                toast.success("Registration successful");
+                addToast({
+                    title: "Registration successful",
+                    description: "Your account has been created",
+                    color: "success"
+                });
                 navigate("/", {replace: true});
                 break;
             case UserInvitationAcceptanceResult.USERNAME_TAKEN:
                 formik.setFieldError("username", "Username is already taken");
                 break;
             case UserInvitationAcceptanceResult.TOKEN_EXPIRED:
-                toast.error("Token is expired");
+                addToast({
+                    title: "Token expired",
+                    description: "Token is expired",
+                    color: "warning"
+                });
                 break;
             case UserInvitationAcceptanceResult.TOKEN_INVALID:
             default:
-                toast.error("Token is invalid");
-                break
+                addToast({
+                    title: "Invalid token",
+                    description: "Token is invalid",
+                    color: "danger"
+                });
+                break;
         }
     }
 
diff --git a/gameyfin/src/main/frontend/views/PasswordResetView.tsx b/gameyfin/src/main/frontend/views/PasswordResetView.tsx
index 8bbd0f7..bcfd629 100644
--- a/gameyfin/src/main/frontend/views/PasswordResetView.tsx
+++ b/gameyfin/src/main/frontend/views/PasswordResetView.tsx
@@ -1,4 +1,4 @@
-import {Button, Card, CardBody, CardHeader} from "@heroui/react";
+import {addToast, Button, Card, CardBody, CardHeader} from "@heroui/react";
 import {useNavigate, useSearchParams} from "react-router-dom";
 import {Form, Formik} from "formik";
 import Input from "Frontend/components/general/Input";
@@ -6,7 +6,6 @@ import * as Yup from "yup";
 import {PasswordResetEndpoint} from "Frontend/generated/endpoints";
 import React, {useEffect, useState} from "react";
 import {Warning} from "@phosphor-icons/react";
-import {toast} from "sonner";
 import TokenValidationResult from "Frontend/generated/de/grimsi/gameyfin/shared/token/TokenValidationResult";
 
 export default function PasswordResetView() {
@@ -25,15 +24,27 @@ export default function PasswordResetView() {
 
         switch (result) {
             case TokenValidationResult.VALID:
-                toast.success("Password reset successfully");
+                addToast({
+                    title: "Password reset",
+                    description: "Password reset successfully",
+                    color: "success"
+                })
                 navigate("/", {replace: true});
                 break;
             case TokenValidationResult.EXPIRED:
-                toast.error("Token is expired");
+                addToast({
+                    title: "Token expired",
+                    description: "Token is expired",
+                    color: "warning"
+                })
                 break;
             case TokenValidationResult.INVALID:
             default:
-                toast.error("Token is invalid");
+                addToast({
+                    title: "Invalid token",
+                    description: "Token is invalid",
+                    color: "danger"
+                })
                 break
         }
     }
diff --git a/gameyfin/src/main/frontend/views/SetupView.tsx b/gameyfin/src/main/frontend/views/SetupView.tsx
index 1ea2ff3..de0053e 100644
--- a/gameyfin/src/main/frontend/views/SetupView.tsx
+++ b/gameyfin/src/main/frontend/views/SetupView.tsx
@@ -4,11 +4,10 @@ import Wizard from "Frontend/components/wizard/Wizard";
 import WizardStep from "Frontend/components/wizard/WizardStep";
 import Input from "Frontend/components/general/Input";
 import {HandWaving, Palette, User} from "@phosphor-icons/react";
-import {Card} from "@heroui/react";
+import {addToast, Card} from "@heroui/react";
 import {SetupEndpoint} from "Frontend/generated/endpoints";
 import {ThemeSelector} from "Frontend/components/theming/ThemeSelector";
 import {useNavigate} from "react-router-dom";
-import {toast} from "sonner";
 
 function WelcomeStep() {
     return (
@@ -91,7 +90,11 @@ function SetupView() {
                                 password: values.password,
                                 email: values.email
                             });
-                            toast.success("Setup finished", {description: "Have fun with Gameyfin!"});
+                            addToast({
+                                title: "Setup finished",
+                                description: "Have fun with Gameyfin!",
+                                color: "success"
+                            })
                             navigate('/login');
                         }
                     }
diff --git a/gameyfin/src/main/frontend/views/TestView.tsx b/gameyfin/src/main/frontend/views/TestView.tsx
index 60139d2..b906f8c 100644
--- a/gameyfin/src/main/frontend/views/TestView.tsx
+++ b/gameyfin/src/main/frontend/views/TestView.tsx
@@ -1,6 +1,5 @@
 import {Link} from "react-router-dom";
-import {Button, Input} from "@heroui/react";
-import {toast} from "sonner";
+import {addToast, Button, Input} from "@heroui/react";
 import {LibraryEndpoint, SystemEndpoint} from "Frontend/generated/endpoints";
 import {useState} from "react";
 import GameDto from "Frontend/generated/de/grimsi/gameyfin/games/dto/GameDto";
@@ -23,32 +22,25 @@ export default function TestView() {
                 <Link to="/setup">Setup</Link>
                 <div className="flex flex-row gap-4">
                     <Button onPress={
-                        () => toast("Normal", {
-                            description: "Description",
-                            action: {
-                                label: "OK",
-                                onClick: () => {
-                                },
-                            }
-                        })}>Toast (Normal)</Button>
+                        () => addToast({
+                            title: "Primary",
+                            description: "Description"
+                        })
+                    }>Toast (Normal)</Button>
                     <Button onPress={
-                        () => toast.success("Success", {
+                        () => addToast({
+                            title: "Success",
                             description: "Description",
-                            action: {
-                                label: "OK",
-                                onClick: () => {
-                                },
-                            }
-                        })}>Toast (Success)</Button>
+                            color: "success"
+                        })
+                    }>Toast (Success)</Button>
                     <Button onPress={
-                        () => toast.error("Error", {
+                        () => addToast({
+                            title: "Error",
                             description: "Description",
-                            action: {
-                                label: "OK",
-                                onClick: () => {
-                                },
-                            }
-                        })}>Toast (Error)</Button>
+                            color: "danger"
+                        })
+                    }>Toast (Error)</Button>
                 </div>
                 <Button onPress={() => SystemEndpoint.restart()}>Restart</Button>
                 <div className="flex flex-row gap-4 items-center">
diff --git a/gameyfin/tailwind.config.ts b/gameyfin/tailwind.config.ts
index f63ce59..bbee8c6 100644
--- a/gameyfin/tailwind.config.ts
+++ b/gameyfin/tailwind.config.ts
@@ -1,6 +1,6 @@
 import {Config} from "tailwindcss/types/config";
 import {heroui} from "@heroui/react";
-import {NextUIConfig} from "./nextui";
+import {HeroUIConfig} from "./nextui";
 import withMT from "@material-tailwind/react/utils/withMT";
 
 export default withMT({
@@ -22,6 +22,6 @@ export default withMT({
         }
     },
     plugins: [
-        heroui(NextUIConfig)
+        heroui(HeroUIConfig)
     ],
 } satisfies Config);
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index ba9e5f8..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "gameyfin",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}