diff --git a/app/(pages)/(hackers)/(hub)/page.tsx b/app/(pages)/(hackers)/(hub)/page.tsx
index 9362a9e3d..f2eca79b8 100644
--- a/app/(pages)/(hackers)/(hub)/page.tsx
+++ b/app/(pages)/(hackers)/(hub)/page.tsx
@@ -4,22 +4,24 @@ import Discord from '@pages/(hackers)/_components/StayUpToDate/Discord';
 import Footer from '@components/Footer/Footer';
 import Hero from '../_components/Hero/Hero';
 // import IndexHero from '@pages/(hackers)/_components/IndexHero/IndexHero';
-// import IndexHeroContentHacking from '@pages/(hackers)/_components/DOE/Hacking/IndexHeroContentHacking';
 // import IndexHeroContentJudging from '@pages/(hackers)/_components/DOE/Judging/IndexHeroContentJudging';
 import ClientTimeProtectedDisplay from '@pages/_components/TimeProtectedDisplay/ClientTimeProtectedDisplay';
 import TableNumberCheckin from '@pages/(hackers)/_components/TableNumberCheckin/TableNumberCheckin';
 import TableNumberContextProvider from '@pages/_contexts/TableNumberContext';
 import MDHelp from '@pages/(hackers)/_components/MentorAndDirectorHelp/MDHelp';
+import ScheduleSneakPeek from '@pages/(hackers)/_components/ScheduleSneakPeek/ScheduleSneakPeek';
 
 export default function Page() {
   return (
     <main id="home">
       <TableNumberContextProvider>
-        <Hero />
+        <ClientTimeProtectedDisplay featureId="hero-hacking">
+          <Hero />
+          <ScheduleSneakPeek />
+          <BeginnersSection />
+          <MDHelp />
+        </ClientTimeProtectedDisplay>
         {/* <IndexHero>
-          <ClientTimeProtectedDisplay featureId="hero-hacking">
-            <IndexHeroContentHacking />
-          </ClientTimeProtectedDisplay>
           <ClientTimeProtectedDisplay featureId="hero-judging">
             <IndexHeroContentJudging />
           </ClientTimeProtectedDisplay>
@@ -28,8 +30,6 @@ export default function Page() {
           <TableNumberCheckin />
         </ClientTimeProtectedDisplay>
       </TableNumberContextProvider>
-      <BeginnersSection />
-      <MDHelp />
       <Discord />
       {/* <PrizeTracks /> */}
       <Footer />
diff --git a/app/(pages)/(hackers)/(hub)/schedule/page.tsx b/app/(pages)/(hackers)/(hub)/schedule/page.tsx
index a37218329..a34af4dcb 100644
--- a/app/(pages)/(hackers)/(hub)/schedule/page.tsx
+++ b/app/(pages)/(hackers)/(hub)/schedule/page.tsx
@@ -5,9 +5,11 @@ import Loader from '@components/Loader/Loader';
 import Footer from '@components/Footer/Footer';
 import Image from 'next/image';
 import headerGrass from '@public/hackers/schedule/header_grass.svg';
-import Event, { EventType } from '@typeDefs/event';
+import Event from '@typeDefs/event';
+import { ScheduleFilter } from '@typeDefs/filters';
 import { Button } from '@pages/_globals/components/ui/button';
 import Filters from '@pages/(hackers)/_components/Schedule/Filters';
+import ScheduleMobileControls from '@pages/(hackers)/_components/Schedule/ScheduleMobileControls';
 
 import {
   Tooltip,
@@ -45,15 +47,13 @@ export default function Page() {
   const [activeTab, setActiveTab] = useState<'schedule' | 'personal'>(
     'schedule'
   );
-  const [hoveredTab, setHoveredTab] = useState<'schedule' | 'personal' | null>(
-    null
-  );
-  const [activeDay, setActiveDay] = useState<'19' | '20'>('19');
-  const [activeFilters, setActiveFilters] = useState<EventType[]>([]);
+  const [activeDay, setActiveDay] = useState<'9' | '10'>('9');
+  const [activeFilters, setActiveFilters] = useState<ScheduleFilter[]>(['ALL']);
+  const [isMobileFilterOpen, setIsMobileFilterOpen] = useState(false);
   const [scheduleData, setScheduleData] = useState<ScheduleData | null>(null);
   const [isActionInProgress, setIsActionInProgress] = useState(false);
 
-  const changeActiveDay = (day: '19' | '20') => {
+  const changeActiveDay = (day: '9' | '10') => {
     setActiveDay(day);
     window.scrollTo({ top: 0, behavior: 'smooth' });
   };
@@ -230,7 +230,7 @@ export default function Page() {
     // Apply filter logic
     let filteredEvents = eventsForDay;
 
-    if (activeFilters.length > 0) {
+    if (activeFilters.length > 0 && !activeFilters.includes('ALL')) {
       filteredEvents = eventsForDay.filter((eventDetail) => {
         // Special handling for RECOMMENDED filter
         if (activeFilters.includes('RECOMMENDED')) {
@@ -286,12 +286,21 @@ export default function Page() {
     });
   }, [dataToUse, activeDay, activeFilters]);
 
-  const toggleFilter = (label: EventType) => {
-    if (activeFilters.includes(label)) {
-      setActiveFilters(activeFilters.filter((id) => id !== label));
-    } else {
-      setActiveFilters([...activeFilters, label]);
+  const toggleFilter = (label: ScheduleFilter) => {
+    if (label === 'ALL') {
+      setActiveFilters(['ALL']);
+      return;
     }
+
+    const withoutAll = activeFilters.filter((id) => id !== 'ALL');
+
+    if (withoutAll.includes(label)) {
+      const nextFilters = withoutAll.filter((id) => id !== label);
+      setActiveFilters(nextFilters.length > 0 ? nextFilters : ['ALL']);
+      return;
+    }
+
+    setActiveFilters([...withoutAll, label]);
   };
 
   // Update the loading state to include eventsLoading
@@ -320,48 +329,44 @@ export default function Page() {
 
   return (
     <main id="schedule" className="w-full">
-      <div className="absolute aspect-[380/75] lg:aspect-[1583/351] w-full top-[calc(-1*100vw*11/375)] lg:top-[calc(-1*100vw*10/1440)] z-0 overflow-x-clip">
+      <div className="absolute aspect-[380/75] lg:aspect-[1583/351] w-full top-[calc(-1*100vw*11/375)] lg:top-[calc(-1*100vw*10/1440)] z-0 overflow-x-clip pointer-events-none">
         <Image
           src={headerGrass}
           alt="header-grass"
           className="w-[calc(100vw*380/375)] lg:w-[calc(100vw*1583/1440)] margin-auto"
         />
       </div>
-      <div className="pb-24 md:pb-44 md:px-[calc(100vw*76/768)] lg:md:px-[calc(100vw*151/1440)] mt-[100px] md:mt-[calc(100vw*150/1440)]">
-        {/* Headers */}
-        <div className="flex flex-col gap-8">
-          <div className="flex justify-evenly md:justify-between items-center relative border-b-4 border-[#8F8F8F33]">
+      <div className="w-[90%] mx-auto pb-24 md:pb-44 mt-[100px] md:mt-[calc(100vw*150/1440)] flex flex-col gap-6 md:grid md:gap-0 md:grid-cols-[minmax(56px,1fr)_minmax(0,11fr)] md:grid-rows-[auto_auto_1fr] md:gap-x-8">
+        <div className="md:col-start-2 md:row-start-1">
+          <div className="flex justify-evenly md:justify-start items-center relative border-b-[3px] border-[#E9E9E7]">
             <div className="flex lg:gap-4 items-baseline justify-center md:justify-start w-full">
-              <span
+              <button
                 onClick={() => setActiveTab('schedule')}
-                onMouseEnter={() => setHoveredTab('schedule')}
-                onMouseLeave={() => setHoveredTab(null)}
-                className={`relative text-center md:text-left cursor-pointer font-metropolis text-3xl font-bold leading-normal md:tracking-[0.96px] w-1/2 md:w-auto md:pr-4 pb-2 ${
+                type="button"
+                className={`relative text-center md:text-left cursor-pointer font-jakarta text-3xl font-bold leading-normal md:tracking-[0.96px] w-1/2 md:w-auto md:pr-4 pb-2 bg-transparent border-none ${
                   activeTab === 'schedule'
-                    ? 'text-black after:content-[""] after:absolute after:left-0 after:bottom-[-4px] after:w-full after:h-[3px] after:bg-black after:z-10'
-                    : hoveredTab === 'schedule'
-                    ? 'text-black'
-                    : 'text-[#8F8F8F]'
+                    ? 'text-[#3F3F3F] after:content-[""] after:absolute after:left-0 after:bottom-[-3px] after:w-full after:h-[3px] after:bg-[#3F3F3F] after:z-10'
+                    : 'text-[#ACACB9]'
                 }`}
               >
                 All Events
-              </span>
-              <span
-                onClick={() => setActiveTab('personal')}
-                onMouseEnter={() => setHoveredTab('personal')}
-                onMouseLeave={() => setHoveredTab(null)}
-                className={`relative text-center md:text-left cursor-pointer font-metropolis text-3xl font-bold leading-normal md:tracking-[0.96px] w-1/2 md:w-auto md:pr-4 pb-2 ${
-                  activeTab === 'personal'
-                    ? 'text-black after:content-[""] after:absolute after:left-0 after:bottom-[-4px] after:w-full after:h-[3px] after:bg-black after:z-10'
-                    : hoveredTab === 'personal'
-                    ? 'text-black'
-                    : 'text-[#8F8F8F]'
-                }`}
-              >
-                {/* Personal */}
+              </button>
+              <div className="w-1/2 md:w-auto">
                 <TooltipProvider>
                   <Tooltip>
-                    <TooltipTrigger>Personal</TooltipTrigger>
+                    <TooltipTrigger asChild>
+                      <button
+                        onClick={() => setActiveTab('personal')}
+                        type="button"
+                        className={`relative text-center md:text-left cursor-pointer font-jakarta text-3xl font-bold leading-normal md:tracking-[0.96px] md:pr-4 pb-2 bg-transparent border-none ${
+                          activeTab === 'personal'
+                            ? 'text-[#3F3F3F] after:content-[""] after:absolute after:left-0 after:bottom-[-3px] after:w-full after:h-[3px] after:bg-[#3F3F3F] after:z-10'
+                            : 'text-[#ACACB9]'
+                        }`}
+                      >
+                        Personal
+                      </button>
+                    </TooltipTrigger>
                     <TooltipContent side="bottom" className="bg-[#EDFBFA]">
                       <div className="flex gap-4 rounded-full items-center justify-between ">
                         <div className="relative rounded-full w-12 h-12">
@@ -377,48 +382,65 @@ export default function Page() {
                     </TooltipContent>
                   </Tooltip>
                 </TooltipProvider>
-              </span>
-            </div>
-
-            <div className="fixed bottom-4 z-20 md:static md:flex lg:pt-[10px]">
-              <div
-                className="relative bg-[#ffffffe6] md:bg-transparent flex items-center w-[202px] h-[48px] md:border-[1.5px] md:border-black rounded-[22px]"
-                style={{ borderStyle: 'dashed' }}
-              >
-                <div
-                  className={`absolute top-auto bottom-auto transition-all duration-300 ease-in-out w-[98px] h-[42px] bg-black rounded-[20px] ${
-                    activeDay === '19'
-                      ? 'left-[1.5px] top-[1.5px]'
-                      : 'left-[98.5px] top-[1.5px]'
-                  }`}
-                />
-                <button
-                  onClick={() => changeActiveDay('19')}
-                  className={`relative z-10 flex-1 font-jakarta text-[18px] font-weight-[600] font-normal tracking-[0.36px] leading-[100%] bg-transparent ${
-                    activeDay === '19' ? 'text-white' : 'text-black'
-                  }`}
-                >
-                  Apr 19
-                </button>
-                <button
-                  onClick={() => changeActiveDay('20')}
-                  className={`relative z-10 flex-1 font-jakarta text-[18px] font-weight-[600] font-normal tracking-[0.36px] leading-[100%] bg-transparent ${
-                    activeDay === '20' ? 'text-white' : 'text-black'
-                  }`}
-                >
-                  Apr 20
-                </button>
               </div>
             </div>
           </div>
         </div>
-        <Filters toggleFilter={toggleFilter} activeFilters={activeFilters} />
 
-        <div className="px-[calc(100vw*30/375)] md:px-0 mb-[100px] mt-[24px] lg:mt-[48px]">
+        <ScheduleMobileControls
+          activeDay={activeDay}
+          changeActiveDay={changeActiveDay}
+          activeFilters={activeFilters}
+          toggleFilter={toggleFilter}
+          isMobileFilterOpen={isMobileFilterOpen}
+          setIsMobileFilterOpen={setIsMobileFilterOpen}
+        />
+
+        <div className="hidden md:contents">
+          <div className="min-w-0 flex-1 md:col-start-2 md:row-start-2 md:mt-8">
+            <Filters
+              toggleFilter={toggleFilter}
+              activeFilters={activeFilters}
+            />
+          </div>
+
+          <div className="shrink-0 flex flex-col gap-2 items-start md:col-start-1 md:row-start-2 md:mt-8">
+            <button
+              onClick={() => changeActiveDay('9')}
+              type="button"
+              className={`w-fit bg-transparent border-none p-0 text-left font-dm-mono text-base md:text-lg font-medium tracking-[0.36px] leading-[100%] inline-flex items-center ${
+                activeDay === '9' ? 'text-[#3F3F3F]' : 'text-[#ACACB9]'
+              }`}
+            >
+              {activeDay === '9' && (
+                <span className="mr-2" aria-hidden>
+                  {'\u2022'}
+                </span>
+              )}
+              <span>MAY 9</span>
+            </button>
+            <button
+              onClick={() => changeActiveDay('10')}
+              type="button"
+              className={`w-fit bg-transparent border-none p-0 text-left font-dm-mono text-base md:text-lg font-medium tracking-[0.36px] leading-[100%] inline-flex items-center ${
+                activeDay === '10' ? 'text-[#3F3F3F]' : 'text-[#ACACB9]'
+              }`}
+            >
+              {activeDay === '10' && (
+                <span className="mr-2" aria-hidden>
+                  {'\u2022'}
+                </span>
+              )}
+              <span>MAY 10</span>
+            </button>
+          </div>
+        </div>
+
+        <div className="w-full md:col-start-2 md:row-start-3 mb-[100px] mt-2 md:mt-[24px] lg:mt-[48px]">
           {sortedGroupedEntries.length > 0 ? (
             sortedGroupedEntries.map(([timeKey, events]) => (
               <div key={timeKey} className="relative mb-[24px]">
-                <div className="font-jakarta text-sm md:text-lg font-normal leading-[145%] tracking-[0.36px] text-black mt-[16px] mb-[6px]">
+                <div className="font-dm-mono text-sm md:text-lg font-normal leading-[145%] tracking-[0.36px] text-[#7C7C85] mt-[16px] mb-[6px]">
                   {timeKey}
                 </div>
                 <div>
diff --git a/app/(pages)/(hackers)/_components/BigVinyl/BigVinyl.tsx b/app/(pages)/(hackers)/_components/2025BigVinyl/BigVinyl.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/BigVinyl/BigVinyl.tsx
rename to app/(pages)/(hackers)/_components/2025BigVinyl/BigVinyl.tsx
diff --git a/app/(pages)/(hackers)/_components/DOE/Hacking/IndexHeroContentHacking.module.scss b/app/(pages)/(hackers)/_components/2025DOE/Hacking/IndexHeroContentHacking.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/DOE/Hacking/IndexHeroContentHacking.module.scss
rename to app/(pages)/(hackers)/_components/2025DOE/Hacking/IndexHeroContentHacking.module.scss
diff --git a/app/(pages)/(hackers)/_components/DOE/Hacking/IndexHeroContentHacking.tsx b/app/(pages)/(hackers)/_components/2025DOE/Hacking/IndexHeroContentHacking.tsx
similarity index 91%
rename from app/(pages)/(hackers)/_components/DOE/Hacking/IndexHeroContentHacking.tsx
rename to app/(pages)/(hackers)/_components/2025DOE/Hacking/IndexHeroContentHacking.tsx
index db4be7edc..24dd57179 100644
--- a/app/(pages)/(hackers)/_components/DOE/Hacking/IndexHeroContentHacking.tsx
+++ b/app/(pages)/(hackers)/_components/2025DOE/Hacking/IndexHeroContentHacking.tsx
@@ -4,13 +4,13 @@ import Image from 'next/image';
 import { LuArrowUpRight } from 'react-icons/lu';
 import { GoArrowRight } from 'react-icons/go';
 import styles from './IndexHeroContentHacking.module.scss';
-import MusicPlayer from '../../IndexHero/MusicPlayer';
-import Scroll from '../../IndexHero/Scroll';
+import MusicPlayer from '../../2025IndexHero/MusicPlayer';
+import Scroll from '../../2025IndexHero/Scroll';
 import { useRollout } from '@pages/_hooks/useRollout';
 import ClientTimeProtectedDisplay from '@pages/_components/TimeProtectedDisplay/ClientTimeProtectedDisplay';
-import Announcements from '../../IndexHero/Announcements';
-import NextSchedule from '../../IndexHero/NextSchedule';
-import Countdown from '../../IndexHero/Countdown';
+import Announcements from '../../2025IndexHero/Announcements';
+import NextSchedule from '../../2025IndexHero/NextSchedule';
+import Countdown from '../../2025IndexHero/Countdown';
 
 import star from 'public/index/hero/star.svg';
 
diff --git a/app/(pages)/(hackers)/_components/DOE/Judging/IndexHeroContentJudging.module.scss b/app/(pages)/(hackers)/_components/2025DOE/Judging/IndexHeroContentJudging.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/DOE/Judging/IndexHeroContentJudging.module.scss
rename to app/(pages)/(hackers)/_components/2025DOE/Judging/IndexHeroContentJudging.module.scss
diff --git a/app/(pages)/(hackers)/_components/DOE/Judging/IndexHeroContentJudging.tsx b/app/(pages)/(hackers)/_components/2025DOE/Judging/IndexHeroContentJudging.tsx
similarity index 95%
rename from app/(pages)/(hackers)/_components/DOE/Judging/IndexHeroContentJudging.tsx
rename to app/(pages)/(hackers)/_components/2025DOE/Judging/IndexHeroContentJudging.tsx
index b533c6fdb..3206b6cd7 100644
--- a/app/(pages)/(hackers)/_components/DOE/Judging/IndexHeroContentJudging.tsx
+++ b/app/(pages)/(hackers)/_components/2025DOE/Judging/IndexHeroContentJudging.tsx
@@ -1,13 +1,13 @@
 'use client';
 
 import Image from 'next/image';
-import MusicPlayer from '../../IndexHero/MusicPlayer';
+import MusicPlayer from '../../2025IndexHero/MusicPlayer';
 import star_icon from '@public/hackers/hero/star.svg';
 import judge_bunny_and_ducky from '@public/hackers/hero/judge_bunny_and_ducky.svg';
 import { LuArrowUpRight } from 'react-icons/lu';
 import star from 'public/index/hero/star.svg';
 import Link from 'next/link';
-import JudgeBanners from '../../IndexHero/JudgeBanners';
+import JudgeBanners from '../../2025IndexHero/JudgeBanners';
 import styles from './IndexHeroContentJudging.module.scss';
 
 export default function IndexHeroContentJudging() {
diff --git a/app/(pages)/(hackers)/_components/IndexHero/AnnouncementItem.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/AnnouncementItem.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/AnnouncementItem.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/AnnouncementItem.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/AnnouncementItem.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/AnnouncementItem.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/AnnouncementItem.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/AnnouncementItem.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/Announcements.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/Announcements.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/Announcements.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/Announcements.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/Announcements.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/Announcements.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/Announcements.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/Announcements.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/AssigningJudges.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/AssigningJudges.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/AssigningJudges.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/AssigningJudges.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/AssigningJudges.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/AssigningJudges.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/AssigningJudges.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/AssigningJudges.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/Countdown.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/Countdown.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/Countdown.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/Countdown.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/Countdown.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/Countdown.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/Countdown.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/Countdown.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/DoneJudging.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/DoneJudging.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/DoneJudging.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/DoneJudging.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/DoneJudging.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/DoneJudging.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/DoneJudging.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/DoneJudging.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/IndexHero.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/IndexHero.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/IndexHero.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/IndexHero.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/IndexHero.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/IndexHero.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/IndexHero.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/IndexHero.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/IndexHeroContentDone.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/IndexHeroContentDone.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/IndexHeroContentDone.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/IndexHeroContentDone.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/IndexHeroContentDone.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/IndexHeroContentDone.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/IndexHeroContentDone.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/IndexHeroContentDone.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/JudgeBannerIndividual.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/JudgeBannerIndividual.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/JudgeBannerIndividual.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/JudgeBannerIndividual.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/JudgeBannerIndividual.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/JudgeBannerIndividual.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/JudgeBannerIndividual.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/JudgeBannerIndividual.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/JudgeBanners.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/JudgeBanners.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/JudgeBanners.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/JudgeBanners.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/MusicPlayer.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/MusicPlayer.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/MusicPlayer.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/MusicPlayer.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/MusicPlayer.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/MusicPlayer.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/MusicPlayer.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/MusicPlayer.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/NextSchedule.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/NextSchedule.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/NextSchedule.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/NextSchedule.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/NextSchedule.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/NextSchedule.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/NextSchedule.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/NextSchedule.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/NotificationIndividual.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/NotificationIndividual.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/NotificationIndividual.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/NotificationIndividual.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/NotificationIndividual.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/NotificationIndividual.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/NotificationIndividual.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/NotificationIndividual.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/Notifications.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/Notifications.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/Notifications.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/Notifications.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/Scroll.module.scss b/app/(pages)/(hackers)/_components/2025IndexHero/Scroll.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/Scroll.module.scss
rename to app/(pages)/(hackers)/_components/2025IndexHero/Scroll.module.scss
diff --git a/app/(pages)/(hackers)/_components/IndexHero/Scroll.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/Scroll.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/Scroll.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/Scroll.tsx
diff --git a/app/(pages)/(hackers)/_components/IndexHero/TimeTracker.tsx b/app/(pages)/(hackers)/_components/2025IndexHero/TimeTracker.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/IndexHero/TimeTracker.tsx
rename to app/(pages)/(hackers)/_components/2025IndexHero/TimeTracker.tsx
diff --git a/app/(pages)/(hackers)/_components/UnderConstruction/UnderConstruction.module.scss b/app/(pages)/(hackers)/_components/2025UnderConstruction/UnderConstruction.module.scss
similarity index 100%
rename from app/(pages)/(hackers)/_components/UnderConstruction/UnderConstruction.module.scss
rename to app/(pages)/(hackers)/_components/2025UnderConstruction/UnderConstruction.module.scss
diff --git a/app/(pages)/(hackers)/_components/UnderConstruction/UnderConstruction.tsx b/app/(pages)/(hackers)/_components/2025UnderConstruction/UnderConstruction.tsx
similarity index 100%
rename from app/(pages)/(hackers)/_components/UnderConstruction/UnderConstruction.tsx
rename to app/(pages)/(hackers)/_components/2025UnderConstruction/UnderConstruction.tsx
diff --git a/app/(pages)/(hackers)/_components/ProjectInfo/FAQAccordian/FAQAccordian.tsx b/app/(pages)/(hackers)/_components/ProjectInfo/FAQAccordian/FAQAccordian.tsx
index 950efd8da..158085c32 100644
--- a/app/(pages)/(hackers)/_components/ProjectInfo/FAQAccordian/FAQAccordian.tsx
+++ b/app/(pages)/(hackers)/_components/ProjectInfo/FAQAccordian/FAQAccordian.tsx
@@ -11,7 +11,7 @@ import Step3 from 'public/hackers/project-info/Step3.svg';
 import Step4 from 'public/hackers/project-info/Step4.svg';
 import Step5 from 'public/hackers/project-info/Step5.svg';
 import Step6 from 'public/hackers/project-info/Step6.svg';
-import MusicPlayer from '../../IndexHero/MusicPlayer';
+import MusicPlayer from '../../2025IndexHero/MusicPlayer';
 
 const FAQAccordian = () => {
   const steps = [
diff --git a/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx b/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx
index c9ba83e8d..a3f936c83 100644
--- a/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx
+++ b/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx
@@ -1,26 +1,12 @@
 import React from 'react';
 import Image from 'next/image';
-import { EventTag, EventType } from '@typeDefs/event';
-import { pageFilters } from '@typeDefs/filters';
+import Event, { EventTag, EventType } from '@typeDefs/event';
 import { Button } from '@pages/_globals/components/ui/button';
-
-const getBgColor = (type: EventType): string => {
-  const color =
-    pageFilters.find((f) => f.label === type)?.color || 'rgba(0, 0, 0, 0)';
-
-  return color.replace('1)', '0.5)');
-};
-
-const formatTime = (pstDate: Date): string => {
-  return pstDate.toLocaleString('en-US', {
-    hour: 'numeric',
-    minute: '2-digit',
-    hour12: true,
-  });
-};
+import { SCHEDULE_EVENT_STYLES } from './scheduleEventStyles';
+import { formatScheduleTimeRange } from './scheduleTime';
 
 interface CalendarItemProps {
-  event: any;
+  event: Event & { originalType?: string };
   attendeeCount?: number;
   inPersonalSchedule?: boolean;
   onAddToSchedule?: () => void;
@@ -30,6 +16,10 @@ interface CalendarItemProps {
   host?: string;
 }
 
+const isEventType = (value: string): value is EventType => {
+  return value in SCHEDULE_EVENT_STYLES;
+};
+
 export function CalendarItem({
   event,
   attendeeCount,
@@ -40,28 +30,29 @@ export function CalendarItem({
   onRemoveFromSchedule,
 }: CalendarItemProps) {
   const { name, type, location, start_time, end_time } = event;
-  // Use originalType if available (for recommended events) or the regular type
-  const displayType = (event as any).originalType || type;
-  const bgColor = getBgColor(displayType);
+  // Use originalType when present, but guard against unexpected values.
+  const rawType = event.originalType ?? type ?? '';
+  const normalizedType = rawType.toUpperCase();
+  const displayType: EventType = isEventType(normalizedType)
+    ? normalizedType
+    : 'GENERAL';
+  const eventStyle = SCHEDULE_EVENT_STYLES[displayType];
 
   // Handle different time display scenarios
-  let timeDisplay;
-  if (!end_time) {
-    timeDisplay = formatTime(start_time);
-  } else if (start_time === end_time) {
-    timeDisplay = formatTime(start_time);
-  } else {
-    timeDisplay = `${formatTime(start_time).slice(0, -2)} - ${formatTime(
-      end_time
-    )}`;
-  }
+  const timeDisplay = formatScheduleTimeRange(
+    new Date(start_time),
+    end_time ? new Date(end_time) : undefined
+  );
 
   return (
     <div
       className={`w-full py-[24px] flex-shrink-0 rounded-[16px] px-[20px] 2xs:px-[38px] 2xs:py-[24px] lg:px-[40px] lg:py-[32px] mb-[16px] flex ${
         displayType === 'ACTIVITIES' ? 'flex-row' : 'flex-col justify-center'
       }`}
-      style={{ backgroundColor: bgColor }}
+      style={{
+        backgroundColor: eventStyle.bgColor,
+        color: eventStyle.textColor,
+      }}
     >
       <div
         className={`flex items-start justify-between sm:items-center gap-4 relative ${
@@ -77,11 +68,11 @@ export function CalendarItem({
           }`}
         >
           <div className="w-full sm:w-auto">
-            <h2 className="text-black font-metropolis text-xl sm:text-2xl font-semibold tracking-[0.72px] sm:mb-2 text-balance">
+            <h2 className="font-metropolis text-xl sm:text-2xl font-semibold tracking-[0.72px] sm:mb-2 text-balance">
               {name}
             </h2>
             <div className="flex items-center flex-wrap gap-y-2">
-              <span className="text-black font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px] mr-5">
+              <span className="font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px] mr-5">
                 {timeDisplay}
                 {displayType === 'MEALS' && ' (Subject to change)'}
               </span>
@@ -94,7 +85,7 @@ export function CalendarItem({
                     height={13.44}
                     className="mr-1"
                   />
-                  <span className="text-black font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px]">
+                  <span className="font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px]">
                     {location}
                   </span>
                 </div>
@@ -103,10 +94,14 @@ export function CalendarItem({
             {tags && tags.length > 0 && (
               <div className="flex gap-2 items-center sm:py-2 flex-wrap mt-2">
                 {tags.map((tag) => (
-                  <div className="border-black p-1 border-[2px]" key={tag}>
+                  <div
+                    className="px-3 py-1.5 border rounded-md"
+                    style={{ borderColor: eventStyle.textColor }}
+                    key={tag}
+                  >
                     <span
                       key={tag}
-                      className="text-black font-plus-jakarta-sans text-sm font-normal leading-[145%] tracking-[0.36px]"
+                      className="font-plus-jakarta-sans text-sm font-normal leading-[145%] tracking-[0.36px]"
                     >
                       {tag.toUpperCase()}
                     </span>
@@ -118,7 +113,7 @@ export function CalendarItem({
           {displayType !== 'GENERAL' && displayType !== 'MEALS' && (
             <div className="flex flex-col gap-2 items-end text-right pt-1">
               {host && (
-                <span className="text-black font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px] text-balance">
+                <span className="font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px] text-balance">
                   {host}
                 </span>
               )}
@@ -149,7 +144,7 @@ export function CalendarItem({
                     fill
                   />
                 </div>
-                <span className="text-black font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px] text-balance">
+                <span className="font-plus-jakarta-sans text-xs xs:text-sm md:text-base lg:text-lg font-normal leading-[145%] tracking-[0.36px] text-balance">
                   {`${attendeeCount ?? ''} Hacker${
                     attendeeCount && attendeeCount < 2 ? ' is' : 's are'
                   } attending this event`}
@@ -162,16 +157,39 @@ export function CalendarItem({
                 onClick={
                   inPersonalSchedule ? onRemoveFromSchedule : onAddToSchedule
                 }
-                className={`w-full sm:w-32 px-8 py-2 border-2 border-black rounded-3xl border-dashed hover:border-solid cursor-pointer relative group shrink-0`}
+                className="w-full sm:w-32 px-8 py-2 rounded-3xl cursor-pointer relative shrink-0"
+                style={{
+                  backgroundColor:
+                    eventStyle.addButtonColor || 'rgba(0, 0, 0, 0)',
+                  color: eventStyle.textColor,
+                }}
                 variant="ghost"
               >
-                <div
-                  className={`absolute inset-0 rounded-3xl transition-all duration-300 ease-out cursor-pointer bg-black w-0 group-hover:w-full`}
-                />
-                <p
-                  className={`font-semibold relative z-10 transition-colors duration-300 text-black group-hover:text-white`}
-                >
-                  {inPersonalSchedule ? 'Remove' : 'Add'}
+                <p className="font-semibold relative z-10 inline-flex items-center gap-2">
+                  <span
+                    aria-hidden
+                    className="inline-block w-4 h-4"
+                    style={{
+                      backgroundColor: 'currentColor',
+                      WebkitMaskImage: `url(${
+                        inPersonalSchedule
+                          ? '/icons/check.svg'
+                          : '/icons/plus.svg'
+                      })`,
+                      WebkitMaskRepeat: 'no-repeat',
+                      WebkitMaskPosition: 'center',
+                      WebkitMaskSize: 'contain',
+                      maskImage: `url(${
+                        inPersonalSchedule
+                          ? '/icons/check.svg'
+                          : '/icons/plus.svg'
+                      })`,
+                      maskRepeat: 'no-repeat',
+                      maskPosition: 'center',
+                      maskSize: 'contain',
+                    }}
+                  />
+                  {inPersonalSchedule ? 'Added' : 'Add'}
                 </p>
               </Button>
             </div>
diff --git a/app/(pages)/(hackers)/_components/Schedule/Filters.tsx b/app/(pages)/(hackers)/_components/Schedule/Filters.tsx
index acfe31f0a..0aff450f0 100644
--- a/app/(pages)/(hackers)/_components/Schedule/Filters.tsx
+++ b/app/(pages)/(hackers)/_components/Schedule/Filters.tsx
@@ -1,45 +1,42 @@
 import { pageFilters } from '@typeDefs/filters';
-import { EventType } from '@typeDefs/event';
+import { ScheduleFilter } from '@typeDefs/filters';
+
+const FILTER_BUTTON_BG_DEFAULT = '#F3F3FC';
+const FILTER_BUTTON_TEXT_DEFAULT = '#3F3F3F';
+const FILTER_BUTTON_BG_SELECTED = '#3F3F3F';
+const FILTER_BUTTON_TEXT_SELECTED = '#FAFAFF';
 
 interface FiltersProps {
-  activeFilters: EventType[];
-  toggleFilter: (label: EventType) => void;
+  activeFilters: ScheduleFilter[];
+  toggleFilter: (label: ScheduleFilter) => void;
 }
 
 export default function Filters({ activeFilters, toggleFilter }: FiltersProps) {
   return (
-    <div className="px-[calc(100vw*32/375)] md:px-0 flex gap-4 mt-[28px] overflow-x-scroll no-scrollbar">
+    <div className="flex gap-4 overflow-x-scroll no-scrollbar">
       {pageFilters.map((filter) => (
         <button
           key={filter.label}
           onClick={() => toggleFilter(filter.label)}
+          type="button"
           className={`
           relative flex w-[163px] h-[45px] px-[38px] py-[13px]
           justify-center items-center
-          rounded-[22.5px] border-[1.5px]
+          rounded-[22.5px]
           font-jakarta text-sm sm:text-[16px] font-semibold leading-[100%] tracking-[0.32px]
-          text-[#123041] transition-all duration-200
-          ${
-            activeFilters.includes(filter.label)
-              ? `border-solid`
-              : 'border-dashed hover:bg-opacity-50'
-          }
+          transition-all duration-200
         `}
           style={{
-            borderColor: filter.color,
             backgroundColor: activeFilters.includes(filter.label)
-              ? filter.color
-              : 'transparent',
-          }}
-          onMouseEnter={(e) => {
-            if (!activeFilters.includes(filter.label)) {
-              e.currentTarget.style.backgroundColor = filter.color + '80'; // 80 is 50% opacity in hex
-            }
-          }}
-          onMouseLeave={(e) => {
-            if (!activeFilters.includes(filter.label)) {
-              e.currentTarget.style.backgroundColor = 'transparent';
-            }
+              ? filter.label === 'ALL'
+                ? FILTER_BUTTON_BG_SELECTED
+                : filter.color
+              : FILTER_BUTTON_BG_DEFAULT,
+            color: activeFilters.includes(filter.label)
+              ? filter.label === 'ALL'
+                ? FILTER_BUTTON_TEXT_SELECTED
+                : FILTER_BUTTON_TEXT_DEFAULT
+              : FILTER_BUTTON_TEXT_DEFAULT,
           }}
         >
           {filter.label}
diff --git a/app/(pages)/(hackers)/_components/Schedule/ScheduleMobileControls.tsx b/app/(pages)/(hackers)/_components/Schedule/ScheduleMobileControls.tsx
new file mode 100644
index 000000000..54846f4b7
--- /dev/null
+++ b/app/(pages)/(hackers)/_components/Schedule/ScheduleMobileControls.tsx
@@ -0,0 +1,129 @@
+import Image from 'next/image';
+import { pageFilters, ScheduleFilter } from '@typeDefs/filters';
+
+const MOBILE_FILTER_BG_DEFAULT = '#F3F3FC';
+const MOBILE_FILTER_TEXT_DEFAULT = '#3F3F3F';
+const MOBILE_FILTER_BG_SELECTED = '#3F3F3F';
+const MOBILE_FILTER_TEXT_SELECTED = '#FAFAFF';
+
+interface ScheduleMobileControlsProps {
+  activeDay: '9' | '10';
+  changeActiveDay: (day: '9' | '10') => void;
+  activeFilters: ScheduleFilter[];
+  toggleFilter: (label: ScheduleFilter) => void;
+  isMobileFilterOpen: boolean;
+  setIsMobileFilterOpen: (
+    value: boolean | ((prev: boolean) => boolean)
+  ) => void;
+}
+
+export default function ScheduleMobileControls({
+  activeDay,
+  changeActiveDay,
+  activeFilters,
+  toggleFilter,
+  isMobileFilterOpen,
+  setIsMobileFilterOpen,
+}: ScheduleMobileControlsProps) {
+  const hasSelectedFilters = activeFilters.some((filter) => filter !== 'ALL');
+  const selectedFilterDots = activeFilters.filter((filter) => filter !== 'ALL');
+
+  const renderDayButton = (day: '9' | '10', label: string) => (
+    <button
+      onClick={() => changeActiveDay(day)}
+      type="button"
+      className={`w-fit bg-transparent border-none p-0 text-left font-dm-mono text-base font-medium tracking-[0.36px] leading-[100%] inline-flex items-center ${
+        activeDay === day ? 'text-[#3F3F3F]' : 'text-[#ACACB9]'
+      }`}
+    >
+      {activeDay === day && (
+        <span className="mr-2" aria-hidden>
+          {'\u2022'}
+        </span>
+      )}
+      <span>{label}</span>
+    </button>
+  );
+
+  return (
+    <div className="md:hidden">
+      <div className="flex items-start justify-between gap-4">
+        <button
+          onClick={() => setIsMobileFilterOpen((prev) => !prev)}
+          type="button"
+          className={`relative inline-flex w-fit min-w-[52px] h-[45px] px-3 py-[13px] justify-center items-center rounded-[22.5px] font-jakarta text-sm font-semibold leading-[100%] tracking-[0.32px] transition-all duration-200 shrink-0 ${
+            isMobileFilterOpen || hasSelectedFilters
+              ? 'bg-[#3F3F3F]'
+              : 'bg-[#F3F3FC]'
+          }`}
+        >
+          <Image
+            src={
+              isMobileFilterOpen
+                ? '/icons/white_x.svg'
+                : '/icons/hamburger_filter.svg'
+            }
+            alt={isMobileFilterOpen ? 'Close filters' : 'Open filters'}
+            width={16}
+            height={16}
+            className={
+              !isMobileFilterOpen && hasSelectedFilters ? 'invert' : ''
+            }
+          />
+          {selectedFilterDots.length > 0 && (
+            <span className="flex items-center gap-1.5 ml-2">
+              {selectedFilterDots.map((filter) => {
+                const color = pageFilters.find((f) => f.label === filter)
+                  ?.color;
+                return (
+                  <span
+                    key={`mobile-filter-dot-${filter}`}
+                    className="w-2.5 h-2.5 rounded-full border"
+                    style={{
+                      backgroundColor: color,
+                      borderColor: color,
+                    }}
+                  />
+                );
+              })}
+            </span>
+          )}
+        </button>
+
+        {!isMobileFilterOpen && (
+          <div className="shrink-0 h-[45px] flex flex-row gap-8 items-center">
+            {renderDayButton('9', 'MAY 9')}
+            {renderDayButton('10', 'MAY 10')}
+          </div>
+        )}
+      </div>
+
+      {isMobileFilterOpen && (
+        <div className="mt-4 w-full flex flex-col gap-3">
+          {pageFilters.map((filter) => (
+            <button
+              key={`mobile-filter-${filter.label}`}
+              onClick={() => toggleFilter(filter.label)}
+              type="button"
+              className="relative flex w-full h-[45px] px-4 py-[13px] justify-center items-center rounded-[22.5px] font-jakarta text-sm font-semibold leading-[100%] tracking-[0.32px] transition-all duration-200"
+              style={{
+                backgroundColor: activeFilters.includes(filter.label)
+                  ? filter.label === 'ALL'
+                    ? MOBILE_FILTER_BG_SELECTED
+                    : filter.color
+                  : MOBILE_FILTER_BG_DEFAULT,
+                color: activeFilters.includes(filter.label)
+                  ? filter.label === 'ALL'
+                    ? MOBILE_FILTER_TEXT_SELECTED
+                    : MOBILE_FILTER_TEXT_DEFAULT
+                  : MOBILE_FILTER_TEXT_DEFAULT,
+              }}
+            >
+              {filter.label}
+            </button>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/app/(pages)/(hackers)/_components/Schedule/scheduleEventStyles.ts b/app/(pages)/(hackers)/_components/Schedule/scheduleEventStyles.ts
new file mode 100644
index 000000000..716b9aa90
--- /dev/null
+++ b/app/(pages)/(hackers)/_components/Schedule/scheduleEventStyles.ts
@@ -0,0 +1,32 @@
+import { EventType } from '@typeDefs/event';
+
+export interface ScheduleEventStyle {
+  bgColor: string;
+  textColor: string;
+  addButtonColor?: string;
+}
+
+export const SCHEDULE_EVENT_STYLES: Record<EventType, ScheduleEventStyle> = {
+  GENERAL: {
+    bgColor: '#CCFFFE',
+    textColor: '#003D3D',
+  },
+  ACTIVITIES: {
+    bgColor: '#FFE2D5',
+    textColor: '#52230C',
+    addButtonColor: '#FFD5C2',
+  },
+  WORKSHOPS: {
+    bgColor: '#E9FBBA',
+    textColor: '#1A3819',
+    addButtonColor: '#D1F76E',
+  },
+  MEALS: {
+    bgColor: '#FFE7B2',
+    textColor: '#572700',
+  },
+  RECOMMENDED: {
+    bgColor: '#CCFFFE',
+    textColor: '#003D3D',
+  },
+};
diff --git a/app/(pages)/(hackers)/_components/Schedule/scheduleTime.ts b/app/(pages)/(hackers)/_components/Schedule/scheduleTime.ts
new file mode 100644
index 000000000..72c8888dc
--- /dev/null
+++ b/app/(pages)/(hackers)/_components/Schedule/scheduleTime.ts
@@ -0,0 +1,52 @@
+import Event from '@typeDefs/event';
+
+export const formatScheduleTime = (date: Date): string =>
+  date.toLocaleString('en-US', {
+    hour: 'numeric',
+    minute: '2-digit',
+    hour12: true,
+  });
+
+export const formatScheduleTimeRange = (start: Date, end?: Date): string => {
+  if (!end || start.getTime() === end.getTime()) {
+    return formatScheduleTime(start);
+  }
+
+  const startTimeStr = formatScheduleTime(start);
+  const endTimeStr = formatScheduleTime(end);
+
+  const startAMPM = startTimeStr.slice(-2);
+  const endAMPM = endTimeStr.slice(-2);
+
+  if (startAMPM === endAMPM) {
+    return `${startTimeStr.slice(0, -2)} - ${endTimeStr}`;
+  }
+
+  return `${startTimeStr} - ${endTimeStr}`;
+};
+
+export const getScheduleEventEndTime = (event: Event): Date => {
+  if (event.end_time) return new Date(event.end_time);
+  const fallback = new Date(event.start_time);
+  fallback.setMinutes(fallback.getMinutes() + 60);
+  return fallback;
+};
+
+export const isScheduleEventLive = (
+  event: Event,
+  now: Date = new Date()
+): boolean => {
+  const start = new Date(event.start_time);
+  const end = getScheduleEventEndTime(event);
+  return start <= now && now < end;
+};
+
+export const startsScheduleEventInNextMs = (
+  event: Event,
+  msFromNow: number,
+  now: Date = new Date()
+): boolean => {
+  const start = new Date(event.start_time);
+  const endWindow = new Date(now.getTime() + msFromNow);
+  return start > now && start <= endWindow;
+};
diff --git a/app/(pages)/(hackers)/_components/ScheduleSneakPeek/ScheduleSneakPeek.tsx b/app/(pages)/(hackers)/_components/ScheduleSneakPeek/ScheduleSneakPeek.tsx
new file mode 100644
index 000000000..2a5913191
--- /dev/null
+++ b/app/(pages)/(hackers)/_components/ScheduleSneakPeek/ScheduleSneakPeek.tsx
@@ -0,0 +1,152 @@
+'use client';
+
+import Link from 'next/link';
+import Image from 'next/image';
+import CalendarItem from '@pages/(hackers)/_components/Schedule/CalendarItem';
+import {
+  EventEntry,
+  useScheduleSneakPeekData,
+} from '../../../_hooks/useScheduleSneakPeekData';
+
+interface ScheduleSneakPeekProps {
+  className?: string;
+}
+
+function SectionLabel({ label }: { label: string }) {
+  const isLiveLabel = label.trim().toUpperCase() === '\u2022 LIVE';
+  const displayLabel = isLiveLabel ? 'LIVE' : label;
+
+  return (
+    <div className="font-dm-mono text-lg leading-[100%] tracking-[0.36px] text-[#7C7C85] mt-5 mb-4 inline-flex items-center gap-2">
+      {isLiveLabel && (
+        <span
+          aria-hidden
+          className="relative inline-flex items-center justify-center w-3 h-3 shrink-0"
+        >
+          <span className="absolute inset-0 rounded-full bg-[#E9FBBA] z-0" />
+          <span className="absolute w-2 h-2 rounded-full bg-[#D1F76E] z-10 live-indicator-inner" />
+        </span>
+      )}
+      {displayLabel}
+    </div>
+  );
+}
+
+function Panel({
+  title,
+  liveEvents,
+  upcomingEvents,
+  onAddToSchedule,
+  onRemoveFromSchedule,
+}: {
+  title: string;
+  liveEvents: EventEntry[];
+  upcomingEvents: EventEntry[];
+  onAddToSchedule: (eventId: string) => Promise<boolean>;
+  onRemoveFromSchedule: (eventId: string) => Promise<boolean>;
+}) {
+  const renderEventItems = (events: EventEntry[], keyPrefix: string) =>
+    events.map((entry) => (
+      <CalendarItem
+        key={`${keyPrefix}-${entry.event._id}`}
+        event={entry.event}
+        attendeeCount={entry.attendeeCount}
+        inPersonalSchedule={entry.inPersonalSchedule}
+        tags={entry.event.tags}
+        host={entry.event.host}
+        onAddToSchedule={() => {
+          void onAddToSchedule(entry.event._id || '');
+        }}
+        onRemoveFromSchedule={() => {
+          void onRemoveFromSchedule(entry.event._id || '');
+        }}
+      />
+    ));
+
+  return (
+    <div className="rounded-[16px] bg-[#FFFFFF] p-5 lg:p-6">
+      <h2 className="font-jakarta text-[clamp(1.1rem,3vw,2.25rem)] font-semibold leading-tight tracking-[0.64px] text-[#3F3F3F] mb-4">
+        {title}
+      </h2>
+      <div className="border-b border-[#E3E3E3] mb-6" />
+
+      <SectionLabel label="• LIVE" />
+      <div className="space-y-3 mb-[3vw]">
+        {liveEvents.length > 0 ? (
+          renderEventItems(liveEvents, 'live')
+        ) : (
+          <p className="font-jakarta text-sm text-[#7C7C85] mt-[1vw]">
+            No events happening right now.
+          </p>
+        )}
+      </div>
+
+      <SectionLabel label="IN 0:30:00" />
+      <div className="space-y-3">
+        {upcomingEvents.length > 0 ? (
+          renderEventItems(upcomingEvents, 'upcoming')
+        ) : (
+          <p className="font-jakarta text-sm text-[#7C7C85] mt-3">
+            No events starting in the next 30 minutes.
+          </p>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default function ScheduleSneakPeek({
+  className,
+}: ScheduleSneakPeekProps) {
+  const {
+    liveAll,
+    upcomingAll,
+    livePersonal,
+    upcomingPersonal,
+    addToPersonalSchedule,
+    removeFromPersonalSchedule,
+  } = useScheduleSneakPeekData();
+
+  return (
+    <div className="w-full bg-[#FAFAFF]">
+      <section className={`w-[90%] mx-auto py-[5vw] ${className ?? ''}`}>
+        <div className="inline-flex items-center group font-jakarta text-[clamp(1.25rem,4.2vw,3rem)] font-semibold leading-tight tracking-[0.72px] text-[#3F3F3F] whitespace-nowrap">
+          <span className="w-0 group-hover:w-[26px] overflow-hidden transition-all duration-300 ease-out shrink-0">
+            <Image
+              src="/icons/arrow-right.svg"
+              alt=""
+              width={26}
+              height={26}
+              className="-translate-x-3 group-hover:translate-x-0 transition-transform duration-300 ease-out"
+            />
+          </span>
+          <span className="transition-transform duration-300 ease-out group-hover:translate-x-1">
+            Sneak Peek at Your{' '}
+            <Link href="/schedule" className="underline hover:opacity-80">
+              Schedule
+            </Link>
+          </span>
+        </div>
+
+        <div className="border-b border-[#E3E3E3] mt-4 mb-6" />
+
+        <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-5">
+          <Panel
+            title="Happening now"
+            liveEvents={liveAll}
+            upcomingEvents={upcomingAll}
+            onAddToSchedule={addToPersonalSchedule}
+            onRemoveFromSchedule={removeFromPersonalSchedule}
+          />
+          <Panel
+            title="Your schedule"
+            liveEvents={livePersonal}
+            upcomingEvents={upcomingPersonal}
+            onAddToSchedule={addToPersonalSchedule}
+            onRemoveFromSchedule={removeFromPersonalSchedule}
+          />
+        </div>
+      </section>
+    </div>
+  );
+}
diff --git a/app/(pages)/_globals/fonts.ts b/app/(pages)/_globals/fonts.ts
index 5acb165dd..f1c31b794 100644
--- a/app/(pages)/_globals/fonts.ts
+++ b/app/(pages)/_globals/fonts.ts
@@ -1,4 +1,4 @@
-import { Plus_Jakarta_Sans, DM_Sans } from 'next/font/google';
+import { Plus_Jakarta_Sans, DM_Sans, DM_Mono } from 'next/font/google';
 
 const jakarta = Plus_Jakarta_Sans({
   subsets: ['latin'],
@@ -10,7 +10,13 @@ const dm_sans = DM_Sans({
   variable: '--font-dm-sans',
 });
 
-const fonts = [jakarta, dm_sans];
+const dm_mono = DM_Mono({
+  subsets: ['latin'],
+  weight: ['400', '500'],
+  variable: '--font-dm-mono',
+});
+
+const fonts = [jakarta, dm_sans, dm_mono];
 
 const font_variables = fonts.map((font) => font.variable);
 const font_string = font_variables.join(' ');
diff --git a/app/(pages)/_globals/globals.scss b/app/(pages)/_globals/globals.scss
index 921c0d100..9c5e1ce50 100644
--- a/app/(pages)/_globals/globals.scss
+++ b/app/(pages)/_globals/globals.scss
@@ -255,6 +255,25 @@ input[type="datetime-local"] {
   .custom-scrollbar::-webkit-scrollbar-track {
     background: transparent;
   }
+
+  @keyframes livePulse {
+    0% {
+      transform: scale(0.85);
+    }
+
+    50% {
+      transform: scale(1.25);
+    }
+
+    100% {
+      transform: scale(0.85);
+    }
+  }
+
+  .live-indicator-inner {
+    transform-origin: center;
+    animation: livePulse 1.4s ease-in-out infinite;
+  }
 }
 
 
diff --git a/app/(pages)/_hooks/useScheduleSneakPeekData.ts b/app/(pages)/_hooks/useScheduleSneakPeekData.ts
new file mode 100644
index 000000000..812fd4572
--- /dev/null
+++ b/app/(pages)/_hooks/useScheduleSneakPeekData.ts
@@ -0,0 +1,95 @@
+'use client';
+
+import { useMemo, useState, useEffect } from 'react';
+import Event from '@typeDefs/event';
+import { useEvents } from '@hooks/useEvents';
+import { usePersonalEvents } from '@hooks/usePersonalEvents';
+import useActiveUser from '@pages/_hooks/useActiveUser';
+import {
+  isScheduleEventLive,
+  startsScheduleEventInNextMs,
+} from '@pages/(hackers)/_components/Schedule/scheduleTime';
+
+export interface EventEntry {
+  event: Event;
+  attendeeCount: number;
+  inPersonalSchedule: boolean;
+}
+
+const THIRTY_MIN_MS = 30 * 60 * 1000;
+
+const toSorted = (events: EventEntry[]): EventEntry[] =>
+  [...events].sort(
+    (a, b) =>
+      new Date(a.event.start_time).getTime() -
+      new Date(b.event.start_time).getTime()
+  );
+
+export function useScheduleSneakPeekData() {
+  const { user } = useActiveUser('/');
+  const { eventData } = useEvents(user);
+  const {
+    personalEvents,
+    addToPersonalSchedule,
+    removeFromPersonalSchedule,
+    isInPersonalSchedule,
+  } = usePersonalEvents(user?._id || '');
+
+  const allEventEntries = useMemo<EventEntry[]>(() => {
+    return eventData.map((item) => ({
+      event: item.event,
+      attendeeCount: item.attendeeCount || 0,
+      inPersonalSchedule: isInPersonalSchedule(item.event._id || ''),
+    }));
+  }, [eventData, isInPersonalSchedule]);
+
+  const personalEventEntries = useMemo<EventEntry[]>(() => {
+    return personalEvents.map((event) => {
+      const withCount = eventData.find((item) => item.event._id === event._id);
+      return {
+        event,
+        attendeeCount: withCount?.attendeeCount || 0,
+        inPersonalSchedule: true,
+      };
+    });
+  }, [personalEvents, eventData]);
+
+  const [now, setNow] = useState(new Date());
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setNow(new Date());
+    }, 60000); // Update every 60 seconds
+    return () => clearInterval(interval);
+  }, []);
+
+  const filteredLists = useMemo(
+    () => ({
+      liveAll: toSorted(
+        allEventEntries.filter((entry) => isScheduleEventLive(entry.event, now))
+      ),
+      upcomingAll: toSorted(
+        allEventEntries.filter((entry) =>
+          startsScheduleEventInNextMs(entry.event, THIRTY_MIN_MS, now)
+        )
+      ),
+      livePersonal: toSorted(
+        personalEventEntries.filter((entry) =>
+          isScheduleEventLive(entry.event, now)
+        )
+      ),
+      upcomingPersonal: toSorted(
+        personalEventEntries.filter((entry) =>
+          startsScheduleEventInNextMs(entry.event, THIRTY_MIN_MS, now)
+        )
+      ),
+    }),
+    [allEventEntries, personalEventEntries, now]
+  );
+
+  return {
+    ...filteredLists,
+    addToPersonalSchedule,
+    removeFromPersonalSchedule,
+  };
+}
diff --git a/app/_types/filters.ts b/app/_types/filters.ts
index 03458d593..ef12ca941 100644
--- a/app/_types/filters.ts
+++ b/app/_types/filters.ts
@@ -1,11 +1,14 @@
 import { EventType } from '@typeDefs/event';
 
+export type ScheduleFilter = EventType | 'ALL';
+
 export interface EventFilter {
-  label: EventType;
+  label: ScheduleFilter;
   color: string;
 }
 
 export const pageFilters: EventFilter[] = [
+  { label: 'ALL', color: '#F3F3FC' },
   { label: 'GENERAL', color: 'rgba(158, 231, 229, 1)' },
   { label: 'ACTIVITIES', color: 'rgba(255, 197, 171, 1)' },
   { label: 'WORKSHOPS', color: 'rgba(175, 209, 87, 1)' },
diff --git a/auth.ts b/auth.ts
index a82034fe1..6839c29b7 100644
--- a/auth.ts
+++ b/auth.ts
@@ -97,4 +97,4 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
     },
   },
   secret: process.env.AUTH_SECRET,
-});
\ No newline at end of file
+});
diff --git a/package-lock.json b/package-lock.json
index 89b602b6f..1d0dd12a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -175,6 +175,7 @@
       "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.2",
@@ -873,7 +874,6 @@
       "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
       },
@@ -1000,7 +1000,6 @@
       "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
       },
@@ -2050,8 +2049,7 @@
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
@@ -2156,6 +2154,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -2199,6 +2198,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz",
       "integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -3131,7 +3131,6 @@
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -3150,7 +3149,6 @@
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -3199,7 +3197,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -3219,7 +3216,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -3230,7 +3226,6 @@
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -3245,8 +3240,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@jest/environment": {
       "version": "29.7.0",
@@ -3254,7 +3248,6 @@
       "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -3271,7 +3264,6 @@
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -3299,7 +3291,6 @@
       "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -3318,7 +3309,6 @@
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -3335,7 +3325,6 @@
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -3380,7 +3369,6 @@
       "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -3393,7 +3381,6 @@
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -3415,7 +3402,6 @@
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -3433,7 +3419,6 @@
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -3460,7 +3445,6 @@
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -3476,7 +3460,6 @@
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -3493,7 +3476,6 @@
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -3660,6 +3642,7 @@
       "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.14.tgz",
       "integrity": "sha512-eSXQVCMKU2xc7EcTxe/X/rC9QsV2jUe8eLM3MUCPYbo6V52eCE436akRIvELq/AqZpxx2bwkq7HC0cRhLB+yaw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.23.9",
         "@mui/core-downloads-tracker": "^5.16.14",
@@ -4992,7 +4975,6 @@
       "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
@@ -5003,7 +4985,6 @@
       "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
       }
@@ -5266,6 +5247,7 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.19.tgz",
       "integrity": "sha512-LEwC7o1ifqg/6r2gn9Dns0f1rhK+fPFDoMiceTJ6kWmVk6bgXBI/9IOWfVan4WiAavK9pIVWdX0/e3J+eEUh5A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.19.2"
       }
@@ -5314,6 +5296,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
       "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -5325,6 +5308,7 @@
       "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^18.0.0"
       }
@@ -5426,6 +5410,7 @@
       "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "6.21.0",
         "@typescript-eslint/types": "6.21.0",
@@ -5633,6 +5618,7 @@
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5705,7 +5691,6 @@
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -5722,7 +5707,6 @@
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -6330,6 +6314,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -6395,8 +6380,7 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
@@ -6591,7 +6575,6 @@
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -6601,6 +6584,7 @@
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.9.tgz",
       "integrity": "sha512-EyZ9wWKgpAU0fLJ43YAEIF8sr5F2W3LqbS40ZJyHIner2lY14ufqv2VMp69MAiZ2rpwxEUxEhIH/0U3xyRynxg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -6708,8 +6692,7 @@
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
       "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/class-variance-authority": {
       "version": "0.7.1",
@@ -6796,7 +6779,6 @@
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -6811,8 +6793,7 @@
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/cliui/node_modules/string-width": {
       "version": "4.2.3",
@@ -6820,7 +6801,6 @@
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -6836,7 +6816,6 @@
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -6886,7 +6865,6 @@
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -6897,8 +6875,7 @@
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
       "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/color": {
       "version": "4.2.3",
@@ -7026,7 +7003,6 @@
       "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -7248,7 +7224,6 @@
       "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
       },
@@ -7271,7 +7246,6 @@
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7337,7 +7311,6 @@
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -7559,7 +7532,8 @@
       "version": "8.5.2",
       "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.5.2.tgz",
       "integrity": "sha512-xQ9oVLrun/eCG/7ru3R+I5bJ7shsD8fFwLEY7yPe27/+fDHCNj0OT5EoG5ZbFyOxOcG6yTwW8oTz/dWyFnyGpg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/embla-carousel-auto-height": {
       "version": "8.5.2",
@@ -7613,7 +7587,6 @@
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -7888,6 +7861,7 @@
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -8027,6 +8001,7 @@
       "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -8125,6 +8100,7 @@
       "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.8",
@@ -8977,7 +8953,6 @@
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -9002,7 +8977,6 @@
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -9015,15 +8989,13 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -9450,7 +9422,6 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -9797,8 +9768,7 @@
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/htmlparser2": {
       "version": "8.0.2",
@@ -9844,7 +9814,6 @@
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": ">=10.17.0"
       }
@@ -9887,7 +9856,6 @@
       "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -10201,7 +10169,6 @@
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -10340,7 +10307,6 @@
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       },
@@ -10510,7 +10476,6 @@
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -10526,7 +10491,6 @@
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -10543,7 +10507,6 @@
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -10559,7 +10522,6 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10570,7 +10532,6 @@
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -10692,7 +10653,6 @@
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -10708,7 +10668,6 @@
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -10741,7 +10700,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -10755,7 +10713,6 @@
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -10770,8 +10727,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-cli": {
       "version": "29.7.0",
@@ -10779,7 +10735,6 @@
       "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/test-result": "^29.7.0",
@@ -10814,7 +10769,6 @@
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -10861,7 +10815,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -10875,7 +10828,6 @@
       "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -10893,7 +10845,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -10905,7 +10856,6 @@
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -10927,7 +10877,6 @@
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -10941,7 +10890,6 @@
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -10956,8 +10904,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-diff": {
       "version": "29.7.0",
@@ -11016,7 +10963,6 @@
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -11030,7 +10976,6 @@
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -11048,7 +10993,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -11062,7 +11006,6 @@
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -11077,8 +11020,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-environment-node": {
       "version": "29.7.0",
@@ -11141,7 +11083,6 @@
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -11156,7 +11097,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -11170,7 +11110,6 @@
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -11185,8 +11124,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-matcher-utils": {
       "version": "29.7.0",
@@ -11301,7 +11239,6 @@
       "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -11317,7 +11254,6 @@
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       },
@@ -11346,7 +11282,6 @@
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
@@ -11368,7 +11303,6 @@
       "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "jest-regex-util": "^29.6.3",
         "jest-snapshot": "^29.7.0"
@@ -11383,7 +11317,6 @@
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -11417,7 +11350,6 @@
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -11452,7 +11384,6 @@
       "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -11465,7 +11396,6 @@
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11487,7 +11417,6 @@
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -11501,7 +11430,6 @@
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -11512,7 +11440,6 @@
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -11545,7 +11472,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -11559,7 +11485,6 @@
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -11574,8 +11499,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-util": {
       "version": "29.7.0",
@@ -11617,7 +11541,6 @@
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -11636,7 +11559,6 @@
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -11650,7 +11572,6 @@
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -11665,8 +11586,7 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-watcher": {
       "version": "29.7.0",
@@ -11674,7 +11594,6 @@
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -11913,7 +11832,6 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -11944,7 +11862,6 @@
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -12240,7 +12157,6 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -12312,6 +12228,7 @@
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.13.1.tgz",
       "integrity": "sha512-gdq40tX8StmhP6akMp1pPoEVv+9jTYFSrga/g23JxajPAQhH39ysZrHGzQCSd9PEOnuEQEdjIWqxO7ZSwC0w7Q==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@mongodb-js/saslprep": "^1.1.9",
         "bson": "^6.10.3",
@@ -12554,6 +12471,7 @@
       "resolved": "https://registry.npmjs.org/next/-/next-15.5.9.tgz",
       "integrity": "sha512-agNLK89seZEtC5zUHwtut0+tNrc0Xw4FT/Dg+B/VLEo9pAcS9rtTKpek3V6kVcVwsB2YlqMaHdfZL4eLEVYuCg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@next/env": "15.5.9",
         "@swc/helpers": "0.5.15",
@@ -13096,6 +13014,7 @@
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz",
       "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==",
       "license": "MIT-0",
+      "peer": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -13157,7 +13076,6 @@
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -13343,7 +13261,6 @@
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -13710,6 +13627,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -13851,6 +13769,7 @@
       "resolved": "https://registry.npmjs.org/preact/-/preact-10.11.3.tgz",
       "integrity": "sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
@@ -13893,6 +13812,7 @@
       "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -13938,7 +13858,6 @@
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -13998,8 +13917,7 @@
           "url": "https://opencollective.com/fast-check"
         }
       ],
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/querystring": {
       "version": "0.2.0",
@@ -14035,6 +13953,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
       "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14054,6 +13973,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz",
       "integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.26.0"
       },
@@ -14406,7 +14326,6 @@
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14457,7 +14376,6 @@
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -14471,7 +14389,6 @@
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -14501,7 +14418,6 @@
       "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -14702,6 +14618,7 @@
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.1.tgz",
       "integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -14961,8 +14878,7 @@
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
@@ -15040,7 +14956,6 @@
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -15052,7 +14967,6 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15157,7 +15071,6 @@
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -15385,7 +15298,6 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -15596,6 +15508,7 @@
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
       "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -15842,6 +15755,7 @@
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15990,6 +15904,7 @@
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -16073,7 +15988,6 @@
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -16172,6 +16086,7 @@
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -16354,7 +16269,6 @@
       "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -16369,8 +16283,7 @@
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
@@ -16664,7 +16577,6 @@
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -16757,7 +16669,6 @@
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -16786,8 +16697,7 @@
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/yargs/node_modules/string-width": {
       "version": "4.2.3",
@@ -16795,7 +16705,6 @@
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
diff --git a/public/icons/arrow-right.svg b/public/icons/arrow-right.svg
new file mode 100644
index 000000000..6a58aacc4
--- /dev/null
+++ b/public/icons/arrow-right.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.66666 16H25.3333M25.3333 16L17.3333 24M25.3333 16L17.3333 8" stroke="#3F3F3F" stroke-width="2.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/public/icons/check.svg b/public/icons/check.svg
new file mode 100644
index 000000000..0aee04260
--- /dev/null
+++ b/public/icons/check.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.33337 7.99996L6.66671 11.3333L13.3334 4.66663" stroke="#1A3819" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/public/icons/hamburger_filter.svg b/public/icons/hamburger_filter.svg
new file mode 100644
index 000000000..10db1c9df
--- /dev/null
+++ b/public/icons/hamburger_filter.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 6H20M6 12H18M9 18H15" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/public/icons/plus.svg b/public/icons/plus.svg
new file mode 100644
index 000000000..c1c8b666b
--- /dev/null
+++ b/public/icons/plus.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.66667 1V10.3333M1 5.66667H10.3333" stroke="#52230C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/public/icons/white_x.svg b/public/icons/white_x.svg
new file mode 100644
index 000000000..15d5cea71
--- /dev/null
+++ b/public/icons/white_x.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 6L6 18M6 6L18 18" stroke="#F3F3FC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 6d5ca2c05..7402e54b7 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -121,6 +121,7 @@ const config: Config = {
       },
       fontFamily: {
         jakarta: ['var(--font-jakarta)'],
+        'dm-mono': ['var(--font-dm-mono)'],
         metropolis: ['Metropolis', 'sans-serif'],
       },
     },