diff --git a/src/data/timetable.ts b/src/data/timetable.ts
index 43c6817..8255a1e 100644
--- a/src/data/timetable.ts
+++ b/src/data/timetable.ts
@@ -13,20 +13,40 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
       time: "17:00",
     },
     {
-      titleKey: "schedule.events.preTournamentWarmup",
-      locationKey: "schedule.locations.auditoriumAndStudentHouse",
+      titleKey: "schedule.events.miniTournaments",
+      locationKey: "schedule.locations.studentHouse",
+      time: "18:00",
+    },
+    {
+      titleKey: "schedule.events.tournamentRegistration",
+      locationKey: "schedule.locations.auditorium",
+      time: "18:00",
+    },
+    {
+      titleKey: "schedule.events.streetFighter6",
+      locationKey: "schedule.locations.studentHouse",
       time: "18:00",
     },
     {
-      titleKey: "schedule.events.killerInstinct",
+      titleKey: "schedule.events.smashBrosUltimate",
       locationKey: "schedule.locations.studentHouse",
       time: "18:30",
     },
     {
-      titleKey: "schedule.events.mainTournamentsStart",
+      titleKey: "schedule.events.cs2Tournament",
       locationKey: "schedule.locations.auditorium",
       time: "20:00",
     },
+    {
+      titleKey: "schedule.events.lolTournament",
+      locationKey: "schedule.locations.auditorium",
+      time: "20:00",
+    },
+    {
+      titleKey: "schedule.events.sf6SsbuFinale",
+      locationKey: "schedule.locations.studentHouse",
+      time: "22:00",
+    },
     {
       titleKey: "schedule.events.doorsClose",
       locationKey: "schedule.locations.auditoriumAndStudentHouse",
@@ -40,30 +60,45 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
       time: "10:00",
     },
     {
-      titleKey: "schedule.events.warmup",
-      locationKey: "schedule.locations.auditoriumAndStudentHouse",
-      time: "10:30",
+      titleKey: "schedule.events.cs2Continue",
+      locationKey: "schedule.locations.auditorium",
+      time: "11:00",
     },
     {
-      titleKey: "schedule.events.mainTournamentsContinue",
+      titleKey: "schedule.events.lolContinue",
       locationKey: "schedule.locations.auditorium",
       time: "12:00",
     },
     {
-      titleKey: "schedule.events.miniTournamentsStart",
+      titleKey: "schedule.events.2xkoTournament",
       locationKey: "schedule.locations.studentHouse",
-      time: "13:00",
+      time: "12:00",
     },
     {
-      titleKey: "schedule.events.granblue",
+      titleKey: "schedule.events.tekken8Tournament",
       locationKey: "schedule.locations.studentHouse",
-      time: "13:30",
+      time: "12:30",
+    },
+    {
+      titleKey: "schedule.events.2xkoTekken8Finale",
+      locationKey: "schedule.locations.studentHouse",
+      time: "18:00",
+    },
+    {
+      titleKey: "schedule.events.lolFinale",
+      locationKey: "schedule.locations.auditorium",
+      time: "18:30",
     },
     {
-      titleKey: "schedule.events.granTurismoFinal",
+      titleKey: "schedule.events.granTurismoFinale",
       locationKey: "schedule.locations.studentHouse",
       time: "20:00",
     },
+    {
+      titleKey: "schedule.events.lolTournamentSemifinals",
+      locationKey: "schedule.locations.auditorium",
+      time: "*01:00",
+    },
     {
       titleKey: "schedule.events.doorsClose",
       locationKey: "schedule.locations.auditoriumAndStudentHouse",
@@ -72,22 +107,22 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
   ],
   oct26: [
     {
-      titleKey: "schedule.events.expoClosed",
-      locationKey: "schedule.locations.studentHouse",
-      time: "all day",
+      titleKey: "schedule.events.cs2Finale",
+      locationKey: "schedule.locations.auditorium",
+      time: "10:00",
     },
     {
-      titleKey: "schedule.events.cs2FinalStart",
+      titleKey: "schedule.events.cs2FinalMatch",
       locationKey: "schedule.locations.auditorium",
-      time: "10:00",
+      time: "15:30",
     },
     {
-      titleKey: "schedule.events.cs2Final",
+      titleKey: "schedule.events.cs2TournamentFinale",
       locationKey: "schedule.locations.auditorium",
       time: "18:00",
     },
     {
-      titleKey: "schedule.events.awardCeremony",
+      titleKey: "schedule.events.doorsClose",
       locationKey: "schedule.locations.auditorium",
       time: "18:30",
     },
diff --git a/translations/en.json b/translations/en.json
index 645698b..d313d4f 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -140,19 +140,25 @@
     "oct26": "October 26th",
     "events": {
       "doorsOpen": "Doors open",
-      "preTournamentWarmup": "Pre-tournament warmup and start of mini tournaments",
-      "killerInstinct": "Killer Instinct tournament",
-      "mainTournamentsStart": "CS2 and LoL tournaments begin",
+      "miniTournaments": "Mini tournaments",
+      "tournamentRegistration": "Tournament registration",
+      "streetFighter6": "Street Fighter 6 tournament",
+      "smashBrosUltimate": "Smash Bros. Ultimate tournament",
+      "cs2Tournament": "CS2 tournament",
+      "lolTournament": "LoL tournament",
+      "sf6SsbuFinale": "SF6 & SSBU finale",
       "doorsClose": "Doors close",
-      "warmup": "Warmup",
-      "mainTournamentsContinue": "LoL/CS2 tournaments continue",
-      "miniTournamentsStart": "Mini-tournaments begin",
-      "granblue": "Granblue tournament",
-      "granTurismoFinal": "Gran Turismo final",
-      "cs2FinalStart": "CS2 final begins",
-      "cs2Final": "CS2 final",
-      "awardCeremony": "Award ceremony",
-      "expoClosed": "Expo area is closed"
+      "cs2Continue": "CS2 tournament continues",
+      "lolContinue": "LoL tournament continues",
+      "2xkoTournament": "2XKO tournament",
+      "tekken8Tournament": "Tekken 8 tournament",
+      "2xkoTekken8Finale": "2XKO & Tekken 8 finale",
+      "lolFinale": "LoL finale",
+      "granTurismoFinale": "Gran Turismo finale",
+      "lolTournamentSemifinals": "LoL tournament semifinals",
+      "cs2Finale": "CS2 finale",
+      "cs2FinalMatch": "CS2 final match",
+      "cs2TournamentFinale": "CS2 tournament finale"
     },
     "locations": {
       "registrationSetup": "Registration and setup in auditorium",
diff --git a/translations/et.json b/translations/et.json
index 3a36928..36b66f0 100644
--- a/translations/et.json
+++ b/translations/et.json
@@ -141,19 +141,25 @@
     "oct26": "26. oktoober",
     "events": {
       "doorsOpen": "Uksed avatakse",
-      "preTournamentWarmup": "Eelturniiri soojendus ja miniturniiride algus",
-      "killerInstinct": "Killer Instinct turniir",
-      "mainTournamentsStart": "CS2 ja LoL turniirid algavad",
+      "miniTournaments": "Miniturniirid",
+      "tournamentRegistration": "Turniiride registreerimine",
+      "streetFighter6": "Street Fighter 6 turniir",
+      "smashBrosUltimate": "Smash Bros. Ultimate turniir",
+      "cs2Tournament": "CS2 turniir",
+      "lolTournament": "LoL turniir",
+      "sf6SsbuFinale": "SF6 ja SSBU finaal",
       "doorsClose": "Uksed suletakse",
-      "warmup": "Soojendus",
-      "mainTournamentsContinue": "LoL/CS2 turniirid jätkuvad",
-      "miniTournamentsStart": "Miniturniirid algavad",
-      "granblue": "Granblue turniir",
-      "granTurismoFinal": "Gran Turismo finaal",
-      "cs2FinalStart": "CS2 finaali algus",
-      "cs2Final": "CS2 finaal",
-      "awardCeremony": "Auhinna\u00ADtseremoonia",
-      "expoClosed": "Messiala on suletud"
+      "cs2Continue": "CS2 turniir jätkub",
+      "lolContinue": "LoL turniir jätkub",
+      "2xkoTournament": "2XKO turniir",
+      "tekken8Tournament": "Tekken 8 turniir",
+      "2xkoTekken8Finale": "2XKO ja Tekken 8 finaal",
+      "lolFinale": "LoL finaal",
+      "granTurismoFinale": "Gran Turismo finaal",
+      "lolTournamentSemifinals": "LoL turniiri poolfinaalid",
+      "cs2Finale": "CS2 finaal",
+      "cs2FinalMatch": "CS2 finaalimäng",
+      "cs2TournamentFinale": "CS2 turniiri finaal"
     },
     "locations": {
       "registrationSetup": "Registreerimine ja setup aulas",