diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index b98e20d5e..0fa5e3b24 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -6619,15 +6619,6 @@ SUMMARY:🏊 Team Technical Routine
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:Surfing - Men's Semifinals - Heat 2
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-MENS-200M-ROUND-1
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -6682,6 +6673,15 @@ SUMMARY:🏃 Women's 5000m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:Surfing - Men's Semifinals - Heat 2
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T073000Z-canoe-sprint-MENS-KAYAK-FOUR-500M-HEATS
 DTSTAMP:20240806T073000Z
 DTSTART:20240806T073000Z
diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index a73df10dd..7582f09d0 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -5139,15 +5139,6 @@ SUMMARY:🛶 Women's Kayak Cross Small Final
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:Surfing - Men's Semifinals - Heat 2
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-MENS-200M-ROUND-1
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -5180,15 +5171,6 @@ SUMMARY:🏓 BRA 🇧🇷 - 🇰🇷 KOR
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:Surfing - Women's Semifinals - Heat 2
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-beach-volleyball-WOMENS-ROUND-OF-16-BRA-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -5207,6 +5189,24 @@ SUMMARY:🏐 USA 🇺🇸 - 🇧🇷 BRA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:Surfing - Men's Semifinals - Heat 2
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:Surfing - Women's Semifinals - Heat 2
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-JUMPING-INDIVIDUAL-FINAL
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/CRC.ics b/docs/general/CRC.ics
index 89065788d..de0741d17 100644
--- a/docs/general/CRC.ics
+++ b/docs/general/CRC.ics
@@ -146,10 +146,10 @@ SUMMARY:🏃 Men's 400m Hurdles Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Surfing - Women's Semifinals - Heat 2
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 3961af031..dfa0d80e5 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -8597,15 +8597,6 @@ SUMMARY:🏀 LAT 🇱🇻 - 🇫🇷 FRA
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:Surfing - Men's Semifinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170400Z-athletics-MENS-3000M-STEEPLECHASE-ROUND-1
 DTSTAMP:20240805T170400Z
 DTSTART:20240805T170400Z
@@ -8689,15 +8680,6 @@ SUMMARY:🤽 FRA 🇫🇷 - 🇪🇸 ESP
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:Surfing - Women's Semifinals - Heat 1
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-WOMENS-DISCUS-THROW-FINAL
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8757,6 +8739,24 @@ SUMMARY:🏀 FRA 🇫🇷 - 🇳🇱 NED
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T203000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:Surfing - Men's Semifinals - Heat 1
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:Surfing - Women's Semifinals - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-JUMPING-INDIVIDUAL-FINAL
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/PER.ics b/docs/general/PER.ics
index 17085eb65..8591a3e91 100644
--- a/docs/general/PER.ics
+++ b/docs/general/PER.ics
@@ -1254,10 +1254,10 @@ SUMMARY:⛵ Men's Dinghy - Race 10
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Surfing - Men's Semifinals - Heat 1
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 33fb74662..91317914a 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -8498,15 +8498,6 @@ SUMMARY:🏃 Men's 200m Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:Surfing - Women's Semifinals - Heat 1
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-WOMENS-DISCUS-THROW-FINAL
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8589,6 +8580,15 @@ SUMMARY:🏃 Women's 800m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T214200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:Surfing - Women's Semifinals - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-JUMPING-INDIVIDUAL-FINAL
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 720dfa280..20de0f269 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -28878,15 +28878,6 @@ SUMMARY:🏀 LAT 🇱🇻 - 🇫🇷 FRA
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:Surfing - Men's Semifinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170000Z-athletics-MENS-POLE-VAULT-FINAL
 DTSTAMP:20240805T170000Z
 DTSTART:20240805T170000Z
@@ -28942,15 +28933,6 @@ SUMMARY:🏊 Team Technical Routine
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:Surfing - Men's Semifinals - Heat 2
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T174600Z-cycling-track-WOMENS-TEAM-SPRINT-FINALS-FOR-PLACES-7-8
 DTSTAMP:20240805T174600Z
 DTSTART:20240805T174600Z
@@ -29064,15 +29046,6 @@ SUMMARY:🤽 FRA 🇫🇷 - 🇪🇸 ESP
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:Surfing - Women's Semifinals - Heat 1
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-WOMENS-DISCUS-THROW-FINAL
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -29103,15 +29076,6 @@ SUMMARY:🏃 Women's 200m Semi-Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:Surfing - Women's Semifinals - Heat 2
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-wrestling-MENS-GRECO-ROMAN-60KG-SEMIFINAL-KGZ-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -29198,15 +29162,6 @@ SUMMARY:🤼 MENG Lingzhe 🇨🇳 - 🇨🇱 Yasmani ACOSTA FERNANDEZ
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-MENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:Surfing - Men's Bronze Medal Match
-SUMMARY:🏄 Men's Bronze Medal Match
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T192800Z-wrestling-WOMENS-FREESTYLE-68KG-SEMIFINAL-USA-PRK
 DTSTAMP:20240805T192800Z
 DTSTART:20240805T192800Z
@@ -29272,15 +29227,6 @@ SUMMARY:🏐 CHERIF/AHMED 🇶🇦 - 🇨🇱 M.GRIMALT/E.GRIMALT
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:Surfing - Women's Bronze Medal Match
-SUMMARY:🏄 Women's Bronze Medal Match
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball-MENS-GOLD-MEDAL-GAME-FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -29290,19 +29236,73 @@ SUMMARY:🏀 FRA 🇫🇷 - 🇳🇱 NED
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-MENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T203000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:Surfing - Men's Semifinals - Heat 1
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T210600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:Surfing - Men's Semifinals - Heat 2
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:Surfing - Women's Semifinals - Heat 1
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:Surfing - Women's Semifinals - Heat 2
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T225400Z-surfing-MENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:Surfing - Men's Bronze Medal Match
+SUMMARY:🏄 Men's Bronze Medal Match
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:Surfing - Women's Bronze Medal Match
+SUMMARY:🏄 Women's Bronze Medal Match
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing-MENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Surfing - Men's Gold Medal Match
 SUMMARY:🏄 Men's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Surfing - Women's Gold Medal Match
 SUMMARY:🏄 Women's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
@@ -29532,15 +29532,6 @@ SUMMARY:🤼 Men's Greco-Roman 130kg Repechage
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling-MENS-GRECO-ROMAN-60KG-REPECHAGE
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:Wrestling - Men's Greco-Roman 60kg Repechage
-SUMMARY:🤼 Men's Greco-Roman 60kg Repechage
-LOCATION:Champ-de-Mars Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090000Z-wrestling-WOMENS-FREESTYLE-68KG-REPECHAGE
 DTSTAMP:20240806T090000Z
 DTSTART:20240806T090000Z
diff --git a/docs/general/ja/AUS.ics b/docs/general/ja/AUS.ics
index 22e6bb739..d08ea9574 100644
--- a/docs/general/ja/AUS.ics
+++ b/docs/general/ja/AUS.ics
@@ -6521,15 +6521,6 @@ SUMMARY:🏊 チームテクニカルルーティン
 LOCATION:アクアティックス・センター
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-200M
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -6583,6 +6574,15 @@ SUMMARY:🏃 女子5000m決勝
 LOCATION:スタッド・ド・フランス
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T073000Z-canoe-sprint-K-4500M
 DTSTAMP:20240806T073000Z
 DTSTART:20240806T073000Z
diff --git a/docs/general/ja/BRA.ics b/docs/general/ja/BRA.ics
index f1367e20a..59c699901 100644
--- a/docs/general/ja/BRA.ics
+++ b/docs/general/ja/BRA.ics
@@ -5079,15 +5079,6 @@ SUMMARY:🛶 女子カヤッククロス5-8位決定戦
 LOCATION:ノーティカル ST - ホワイトウォーター
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-200M
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -5119,15 +5110,6 @@ SUMMARY:🏓 ブラジル 🇧🇷 - 🇰🇷 大韓民国
 LOCATION:サウス・パリ・アリーナ4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-beach-volleyball-1-BRA-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -5146,6 +5128,24 @@ SUMMARY:🏐 アメリカ合衆国 🇺🇸 - 🇧🇷 ブラジル
 LOCATION:サウス・パリ・アリーナ1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ja/CRC.ics b/docs/general/ja/CRC.ics
index 1be8d82c9..93f187688 100644
--- a/docs/general/ja/CRC.ics
+++ b/docs/general/ja/CRC.ics
@@ -145,10 +145,10 @@ SUMMARY:🏃 男子400mハードル予選
 LOCATION:スタッド・ド・フランス
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:タウポ、タヒチ
diff --git a/docs/general/ja/FRA.ics b/docs/general/ja/FRA.ics
index c844054ea..bc683fe3b 100644
--- a/docs/general/ja/FRA.ics
+++ b/docs/general/ja/FRA.ics
@@ -8503,15 +8503,6 @@ SUMMARY:🏀 ラトビア 🇱🇻 - 🇫🇷 フランス
 LOCATION:コンコルド広場1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170400Z-athletics-3000M
 DTSTAMP:20240805T170400Z
 DTSTART:20240805T170400Z
@@ -8593,15 +8584,6 @@ SUMMARY:🤽 フランス 🇫🇷 - 🇪🇸 スペイン
 LOCATION:パリ・ラ・デファンス・アレナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8661,6 +8643,24 @@ SUMMARY:🏀 フランス 🇫🇷 - 🇳🇱 オランダ
 LOCATION:コンコルド広場1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ja/PER.ics b/docs/general/ja/PER.ics
index a1b2129fd..f986e623c 100644
--- a/docs/general/ja/PER.ics
+++ b/docs/general/ja/PER.ics
@@ -1238,10 +1238,10 @@ SUMMARY:⛵ 男子ディンギー - レース10
 LOCATION:マルセイユ・マリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:タウポ、タヒチ
diff --git a/docs/general/ja/USA.ics b/docs/general/ja/USA.ics
index 831f0f661..e0df10760 100644
--- a/docs/general/ja/USA.ics
+++ b/docs/general/ja/USA.ics
@@ -8397,15 +8397,6 @@ SUMMARY:🏃 男子200m予選
 LOCATION:スタッド・ド・フランス
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8488,6 +8479,15 @@ SUMMARY:🏃 女子800m決勝
 LOCATION:スタッド・ド・フランス
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ja/general.ics b/docs/general/ja/general.ics
index f9514d600..294784570 100644
--- a/docs/general/ja/general.ics
+++ b/docs/general/ja/general.ics
@@ -28752,15 +28752,6 @@ SUMMARY:🏀 ラトビア 🇱🇻 - 🇫🇷 フランス
 LOCATION:コンコルド広場1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170000Z-athletics-
 DTSTAMP:20240805T170000Z
 DTSTART:20240805T170000Z
@@ -28815,15 +28806,6 @@ SUMMARY:🏊 チームテクニカルルーティン
 LOCATION:アクアティックス・センター
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T174600Z-cycling-track--7-8-POL-CAN
 DTSTAMP:20240805T174600Z
 DTSTART:20240805T174600Z
@@ -28936,15 +28918,6 @@ SUMMARY:🤽 フランス 🇫🇷 - 🇪🇸 スペイン
 LOCATION:パリ・ラ・デファンス・アレナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -28975,15 +28948,6 @@ SUMMARY:🏃 女子200m準決勝
 LOCATION:スタッド・ド・フランス
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-wrestling-60KG-KGZ-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -29070,15 +29034,6 @@ SUMMARY:🤼 MENG Lingzhe 🇨🇳 - 🇨🇱 Yasmani ACOSTA FERNANDEZ
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-3
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:サーフィン - 男子3位決定戦
-SUMMARY:🏄 男子3位決定戦
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T192800Z-wrestling-68KG-USA-PRK
 DTSTAMP:20240805T192800Z
 DTSTART:20240805T192800Z
@@ -29144,15 +29099,6 @@ SUMMARY:🏐 CHERIF/AHMED 🇶🇦 - 🇨🇱 M.GRIMALT/E.GRIMALT
 LOCATION:エッフェル塔スタジアム
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-3
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:サーフィン - 女子3位決定戦
-SUMMARY:🏄 女子3位決定戦
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball--FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -29162,19 +29108,73 @@ SUMMARY:🏀 フランス 🇫🇷 - 🇳🇱 オランダ
 LOCATION:コンコルド広場1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T225400Z-surfing-3
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:サーフィン - 男子3位決定戦
+SUMMARY:🏄 男子3位決定戦
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing-3
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:サーフィン - 女子3位決定戦
+SUMMARY:🏄 女子3位決定戦
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:サーフィン - 男子決勝戦
 SUMMARY:🏄 男子決勝戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:サーフィン - 女子決勝戦
 SUMMARY:🏄 女子決勝戦
 LOCATION:タウポ、タヒチ
@@ -29410,15 +29410,6 @@ SUMMARY:🤼 男子グレコローマンスタイル130kg級敗者復活戦
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling-60KG
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:レスリング - 男子グレコローマンスタイル60kg級敗者復活戦
-SUMMARY:🤼 男子グレコローマンスタイル60kg級敗者復活戦
-LOCATION:シャン・ド・マルス・アリーナ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090000Z-canoe-sprint-C-2500M
 DTSTAMP:20240806T090000Z
 DTSTART:20240806T090000Z
diff --git a/docs/general/ko/AUS.ics b/docs/general/ko/AUS.ics
index 164e75858..ecb978d23 100644
--- a/docs/general/ko/AUS.ics
+++ b/docs/general/ko/AUS.ics
@@ -6516,15 +6516,6 @@ SUMMARY:🏊 단체 테크니컬루틴
 LOCATION:아쿠아틱 센터
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:서핑 - 남자 준결승 - 2조
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics--200M-1
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -6578,6 +6569,15 @@ SUMMARY:🏃 여자 5000m 결승
 LOCATION:스타드 드 프랑스
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:서핑 - 남자 준결승 - 2조
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T073000Z-canoe-sprint--500M-
 DTSTAMP:20240806T073000Z
 DTSTART:20240806T073000Z
diff --git a/docs/general/ko/BRA.ics b/docs/general/ko/BRA.ics
index 551fd7631..c6d984651 100644
--- a/docs/general/ko/BRA.ics
+++ b/docs/general/ko/BRA.ics
@@ -5074,15 +5074,6 @@ SUMMARY:🛶 여자 카약 크로스 스몰 파이널
 LOCATION:카누 경기장 - 화이트워터
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:서핑 - 남자 준결승 - 2조
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics--200M-1
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -5114,15 +5105,6 @@ SUMMARY:🏓 브라질 🇧🇷 - 🇰🇷 대한민국
 LOCATION:사우스 파리 아레나 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:서핑 - 여자 준결승 - 2조
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-beach-volleyball--16-BRA-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -5141,6 +5123,24 @@ SUMMARY:🏐 미국 🇺🇸 - 🇧🇷 브라질
 LOCATION:사우스 파리 아레나 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:서핑 - 남자 준결승 - 2조
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:서핑 - 여자 준결승 - 2조
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian--
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ko/CRC.ics b/docs/general/ko/CRC.ics
index c82ba4429..689e00ea6 100644
--- a/docs/general/ko/CRC.ics
+++ b/docs/general/ko/CRC.ics
@@ -145,10 +145,10 @@ SUMMARY:🏃 남자 400m 허들 1라운드
 LOCATION:스타드 드 프랑스
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:서핑 - 여자 준결승 - 2조
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:타히티, 테아후푸
diff --git a/docs/general/ko/FRA.ics b/docs/general/ko/FRA.ics
index 78c822ac3..73865c47b 100644
--- a/docs/general/ko/FRA.ics
+++ b/docs/general/ko/FRA.ics
@@ -8477,15 +8477,6 @@ SUMMARY:🏀 라트비아 🇱🇻 - 🇫🇷 프랑스
 LOCATION:라 콩코르드 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:서핑 - 남자 준결승 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170400Z-athletics--3000M-1
 DTSTAMP:20240805T170400Z
 DTSTART:20240805T170400Z
@@ -8566,15 +8557,6 @@ SUMMARY:🤽 프랑스 🇫🇷 - 🇪🇸 스페인
 LOCATION:파리 라 데팡스 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:서핑 - 여자 준결승 - 1조
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics--
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8634,6 +8616,24 @@ SUMMARY:🏀 프랑스 🇫🇷 - 🇳🇱 네덜란드
 LOCATION:라 콩코르드 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:서핑 - 남자 준결승 - 1조
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:서핑 - 여자 준결승 - 1조
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian--
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ko/PER.ics b/docs/general/ko/PER.ics
index c631f36f3..228e3a6cc 100644
--- a/docs/general/ko/PER.ics
+++ b/docs/general/ko/PER.ics
@@ -1217,10 +1217,10 @@ SUMMARY:⛵ 남자 딩기 - 레이스 10
 LOCATION:마르세유 마리나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:서핑 - 남자 준결승 - 1조
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:타히티, 테아후푸
diff --git a/docs/general/ko/USA.ics b/docs/general/ko/USA.ics
index c0152ec91..b5babcbad 100644
--- a/docs/general/ko/USA.ics
+++ b/docs/general/ko/USA.ics
@@ -8376,15 +8376,6 @@ SUMMARY:🏃 남자 200m 1라운드
 LOCATION:스타드 드 프랑스
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:서핑 - 여자 준결승 - 1조
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics--
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8467,6 +8458,15 @@ SUMMARY:🏃 여자 800m 결승
 LOCATION:스타드 드 프랑스
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:서핑 - 여자 준결승 - 1조
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian--
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ko/general.ics b/docs/general/ko/general.ics
index 16cd3b9da..c08f460f1 100644
--- a/docs/general/ko/general.ics
+++ b/docs/general/ko/general.ics
@@ -28723,15 +28723,6 @@ SUMMARY:🏀 라트비아 🇱🇻 - 🇫🇷 프랑스
 LOCATION:라 콩코르드 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:서핑 - 남자 준결승 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170000Z-athletics--
 DTSTAMP:20240805T170000Z
 DTSTART:20240805T170000Z
@@ -28785,15 +28776,6 @@ SUMMARY:🏊 단체 테크니컬루틴
 LOCATION:아쿠아틱 센터
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:서핑 - 남자 준결승 - 2조
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T174600Z-cycling-track--7-8--POL-CAN
 DTSTAMP:20240805T174600Z
 DTSTART:20240805T174600Z
@@ -28906,15 +28888,6 @@ SUMMARY:🤽 프랑스 🇫🇷 - 🇪🇸 스페인
 LOCATION:파리 라 데팡스 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:서핑 - 여자 준결승 - 1조
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics--
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -28945,15 +28918,6 @@ SUMMARY:🏃 여자 200m 준결승
 LOCATION:스타드 드 프랑스
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:서핑 - 여자 준결승 - 2조
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-wrestling--60KG--KGZ-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -29040,15 +29004,6 @@ SUMMARY:🤼 MENG Lingzhe 🇨🇳 - 🇨🇱 Yasmani ACOSTA FERNANDEZ
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:서핑 - 남자 동메달 결정전
-SUMMARY:🏄 남자 동메달 결정전
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T192800Z-wrestling--68KG--USA-PRK
 DTSTAMP:20240805T192800Z
 DTSTART:20240805T192800Z
@@ -29114,15 +29069,6 @@ SUMMARY:🏐 CHERIF/AHMED 🇶🇦 - 🇨🇱 M.GRIMALT/E.GRIMALT
 LOCATION:에펠탑 스타디움
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:서핑 - 여자 동메달 결정전
-SUMMARY:🏄 여자 동메달 결정전
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball---FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -29132,19 +29078,73 @@ SUMMARY:🏀 프랑스 🇫🇷 - 🇳🇱 네덜란드
 LOCATION:라 콩코르드 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:서핑 - 남자 준결승 - 1조
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:서핑 - 남자 준결승 - 2조
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:서핑 - 여자 준결승 - 1조
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:서핑 - 여자 준결승 - 2조
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:서핑 - 남자 동메달 결정전
+SUMMARY:🏄 남자 동메달 결정전
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:서핑 - 여자 동메달 결정전
+SUMMARY:🏄 여자 동메달 결정전
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:서핑 - 남자 금메달 결정전
 SUMMARY:🏄 남자 금메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:서핑 - 여자 금메달 결정전
 SUMMARY:🏄 여자 금메달 결정전
 LOCATION:타히티, 테아후푸
@@ -29371,15 +29371,6 @@ SUMMARY:🤼 남자 그레코로만 130kg 패자부활전
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling--60KG-
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:레슬링 - 남자 그레코로만형 60kg 패자부활전
-SUMMARY:🤼 남자 그레코로만형 60kg 패자부활전
-LOCATION:샹드마르 아레나
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090000Z-wrestling--68KG-
 DTSTAMP:20240806T090000Z
 DTSTART:20240806T090000Z
diff --git a/docs/general/ru/AUS.ics b/docs/general/ru/AUS.ics
index be6fb3b67..18acea7e7 100644
--- a/docs/general/ru/AUS.ics
+++ b/docs/general/ru/AUS.ics
@@ -6652,15 +6652,6 @@ SUMMARY:🏊 Группы, техническая программа
 LOCATION:Центр водных видов спорта
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2--BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-200-1-
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -6715,6 +6706,15 @@ SUMMARY:🏃 5000м, финал (ж)
 LOCATION:«Стад-де-Франс»
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2--BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T073000Z-canoe-sprint--500-
 DTSTAMP:20240806T073000Z
 DTSTART:20240806T073000Z
diff --git a/docs/general/ru/BRA.ics b/docs/general/ru/BRA.ics
index 781726bae..bf5b7da06 100644
--- a/docs/general/ru/BRA.ics
+++ b/docs/general/ru/BRA.ics
@@ -5156,15 +5156,6 @@ SUMMARY:🛶 Экстрим-слалом, малый финал (ж)
 LOCATION:Водный ст. - Белая вода
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2--BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-200-1-
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -5197,15 +5188,6 @@ SUMMARY:🏓 Бразилия 🇧🇷 - 🇰🇷 Южная Корея
 LOCATION:Арена «Париж-Юг» 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2--BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-beach-volleyball-18--BRA-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -5224,6 +5206,24 @@ SUMMARY:🏐 США 🇺🇸 - 🇧🇷 Бразилия
 LOCATION:Арена «Париж-Юг» 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2--BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2--BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian--
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ru/CRC.ics b/docs/general/ru/CRC.ics
index 15c778d77..0ef7f3c7e 100644
--- a/docs/general/ru/CRC.ics
+++ b/docs/general/ru/CRC.ics
@@ -146,10 +146,10 @@ SUMMARY:🏃 400м с/б, раунд 1 (м)
 LOCATION:«Стад-де-Франс»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2--BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2--BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Теахупоо, Таити
diff --git a/docs/general/ru/FRA.ics b/docs/general/ru/FRA.ics
index ce3cd7519..b4db261eb 100644
--- a/docs/general/ru/FRA.ics
+++ b/docs/general/ru/FRA.ics
@@ -8633,15 +8633,6 @@ SUMMARY:🏀 Латвия 🇱🇻 - 🇫🇷 Франция
 LOCATION:Площадь Согласия 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1--PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170400Z-athletics-3000-1-
 DTSTAMP:20240805T170400Z
 DTSTART:20240805T170400Z
@@ -8726,15 +8717,6 @@ SUMMARY:🤽 Франция 🇫🇷 - 🇪🇸 Испания
 LOCATION:Арена «Пари-Ла-Дефанс»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1--USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics--
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8795,6 +8777,24 @@ SUMMARY:🏀 Франция 🇫🇷 - 🇳🇱 Нидерланды
 LOCATION:Площадь Согласия 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T203000Z-surfing--1--PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1--USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian--
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ru/PER.ics b/docs/general/ru/PER.ics
index 338a099e8..9b0e198b4 100644
--- a/docs/general/ru/PER.ics
+++ b/docs/general/ru/PER.ics
@@ -1256,10 +1256,10 @@ SUMMARY:⛵ Швертбот, гонка 10 (м)
 LOCATION:Марсельская гавань
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1--PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1--PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Теахупоо, Таити
diff --git a/docs/general/ru/USA.ics b/docs/general/ru/USA.ics
index d96a3cf1c..a73f03776 100644
--- a/docs/general/ru/USA.ics
+++ b/docs/general/ru/USA.ics
@@ -8539,15 +8539,6 @@ SUMMARY:🏃 200м, раунд 1 (м)
 LOCATION:«Стад-де-Франс»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1--USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics--
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8631,6 +8622,15 @@ SUMMARY:🏃 800м, финал (ж)
 LOCATION:«Стад-де-Франс»
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1--USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian--
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/ru/general.ics b/docs/general/ru/general.ics
index 63dddc7b3..8e3c71bd4 100644
--- a/docs/general/ru/general.ics
+++ b/docs/general/ru/general.ics
@@ -28954,15 +28954,6 @@ SUMMARY:🏀 Латвия 🇱🇻 - 🇫🇷 Франция
 LOCATION:Площадь Согласия 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1--PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170000Z-athletics--
 DTSTAMP:20240805T170000Z
 DTSTART:20240805T170000Z
@@ -29019,15 +29010,6 @@ SUMMARY:🏊 Группы, техническая программа
 LOCATION:Центр водных видов спорта
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2--BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T174600Z-cycling-track--7--POL-CAN
 DTSTAMP:20240805T174600Z
 DTSTART:20240805T174600Z
@@ -29141,15 +29123,6 @@ SUMMARY:🤽 Франция 🇫🇷 - 🇪🇸 Испания
 LOCATION:Арена «Пари-Ла-Дефанс»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1--USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics--
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -29180,15 +29153,6 @@ SUMMARY:🏃 200м, полуфинал (ж)
 LOCATION:«Стад-де-Франс»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2--BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-wrestling--60--KGZ-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -29275,15 +29239,6 @@ SUMMARY:🤼 MENG Lingzhe 🇨🇳 - 🇨🇱 Yasmani ACOSTA FERNANDEZ
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:Серфинг - Поединок за бронзу (м)
-SUMMARY:🏄 Поединок за бронзу (м)
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T192800Z-wrestling--68--USA-PRK
 DTSTAMP:20240805T192800Z
 DTSTART:20240805T192800Z
@@ -29350,15 +29305,6 @@ SUMMARY:🏐 CHERIF/AHMED 🇶🇦 - 🇨🇱 M.GRIMALT/E.GRIMALT
 LOCATION:Стадион у Эйфелевой башни
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:Серфинг - Поединок за бронзу (ж)
-SUMMARY:🏄 Поединок за бронзу (ж)
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball---FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -29368,19 +29314,73 @@ SUMMARY:🏀 Франция 🇫🇷 - 🇳🇱 Нидерланды
 LOCATION:Площадь Согласия 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T203000Z-surfing--1--PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2--BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1--USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2--BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:Серфинг - Поединок за бронзу (м)
+SUMMARY:🏄 Поединок за бронзу (м)
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:Серфинг - Поединок за бронзу (ж)
+SUMMARY:🏄 Поединок за бронзу (ж)
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Серфинг - Финал (м)
 SUMMARY:🏄 Финал (м)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Серфинг - Финал (ж)
 SUMMARY:🏄 Финал (ж)
 LOCATION:Теахупоо, Таити
@@ -29618,15 +29618,6 @@ SUMMARY:🤼 Греко-римская, 130кг, утешительный рау
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling--60-
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:Борьба - Греко-римская, 60кг, утешительный раунд (м)
-SUMMARY:🤼 Греко-римская, 60кг, утешительный раунд (м)
-LOCATION:Арена «Марсово поле»
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090000Z-canoe-sprint--500-
 DTSTAMP:20240806T090000Z
 DTSTART:20240806T090000Z
diff --git a/docs/general/zh/AUS.ics b/docs/general/zh/AUS.ics
index 7f069d507..793478054 100644
--- a/docs/general/zh/AUS.ics
+++ b/docs/general/zh/AUS.ics
@@ -6517,15 +6517,6 @@ SUMMARY:🏊 团体技术自选
 LOCATION:水上运动中心
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:冲浪 - 男子半决赛 - 第2组
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-2001
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -6579,6 +6570,15 @@ SUMMARY:🏃 女子5000米决赛
 LOCATION:法兰西体育场
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:冲浪 - 男子半决赛 - 第2组
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T073000Z-canoe-sprint-500
 DTSTAMP:20240806T073000Z
 DTSTART:20240806T073000Z
diff --git a/docs/general/zh/BRA.ics b/docs/general/zh/BRA.ics
index f82473fd5..9f882a6ff 100644
--- a/docs/general/zh/BRA.ics
+++ b/docs/general/zh/BRA.ics
@@ -5074,15 +5074,6 @@ SUMMARY:🛶 女子极限皮艇小决赛
 LOCATION:马恩河畔韦尔水上体育场 - 激流回旋
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:冲浪 - 男子半决赛 - 第2组
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T175500Z-athletics-2001
 DTSTAMP:20240805T175500Z
 DTSTART:20240805T175500Z
@@ -5114,15 +5105,6 @@ SUMMARY:🏓 巴西 🇧🇷 - 🇰🇷 韩国
 LOCATION:南巴黎竞技场4号馆
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:冲浪 - 女子半决赛 - 第2组
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-beach-volleyball-16-BRA-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -5141,6 +5123,24 @@ SUMMARY:🏐 美国 🇺🇸 - 🇧🇷 巴西
 LOCATION:南巴黎竞技场1号馆
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:冲浪 - 男子半决赛 - 第2组
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:冲浪 - 女子半决赛 - 第2组
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/zh/CRC.ics b/docs/general/zh/CRC.ics
index f0292f9a1..7e7fd175e 100644
--- a/docs/general/zh/CRC.ics
+++ b/docs/general/zh/CRC.ics
@@ -145,10 +145,10 @@ SUMMARY:🏃 男子400米跨栏第1轮
 LOCATION:法兰西体育场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:冲浪 - 女子半决赛 - 第2组
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:特乎普欧，大溪地
diff --git a/docs/general/zh/FRA.ics b/docs/general/zh/FRA.ics
index affc1d5fb..c58e5f265 100644
--- a/docs/general/zh/FRA.ics
+++ b/docs/general/zh/FRA.ics
@@ -8476,15 +8476,6 @@ SUMMARY:🏀 拉脱维亚 🇱🇻 - 🇫🇷 法国
 LOCATION:协和广场1号场地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:冲浪 - 男子半决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170400Z-athletics-30001
 DTSTAMP:20240805T170400Z
 DTSTART:20240805T170400Z
@@ -8565,15 +8556,6 @@ SUMMARY:🤽 法国 🇫🇷 - 🇪🇸 西班牙
 LOCATION:拉德芳斯体育馆
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:冲浪 - 女子半决赛 - 第1组
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8633,6 +8615,24 @@ SUMMARY:🏀 法国 🇫🇷 - 🇳🇱 荷兰
 LOCATION:协和广场1号场地
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:冲浪 - 男子半决赛 - 第1组
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:冲浪 - 女子半决赛 - 第1组
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/zh/PER.ics b/docs/general/zh/PER.ics
index c1ce30ac4..1d7fd130a 100644
--- a/docs/general/zh/PER.ics
+++ b/docs/general/zh/PER.ics
@@ -1217,10 +1217,10 @@ SUMMARY:⛵ 男子帆船激光级- 比赛10
 LOCATION:马赛港
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:冲浪 - 男子半决赛 - 第1组
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:特乎普欧，大溪地
diff --git a/docs/general/zh/USA.ics b/docs/general/zh/USA.ics
index 06a6da617..dd8d7c77f 100644
--- a/docs/general/zh/USA.ics
+++ b/docs/general/zh/USA.ics
@@ -8374,15 +8374,6 @@ SUMMARY:🏃 男子200米第1轮
 LOCATION:法兰西体育场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:冲浪 - 女子半决赛 - 第1组
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -8465,6 +8456,15 @@ SUMMARY:🏃 女子800米决赛
 LOCATION:法兰西体育场
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:冲浪 - 女子半决赛 - 第1组
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-equestrian-
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/general/zh/general.ics b/docs/general/zh/general.ics
index 8338419ed..4bfc7327c 100644
--- a/docs/general/zh/general.ics
+++ b/docs/general/zh/general.ics
@@ -28717,15 +28717,6 @@ SUMMARY:🏀 拉脱维亚 🇱🇻 - 🇫🇷 法国
 LOCATION:协和广场1号场地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
-DESCRIPTION:冲浪 - 男子半决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T170000Z-athletics-
 DTSTAMP:20240805T170000Z
 DTSTART:20240805T170000Z
@@ -28779,15 +28770,6 @@ SUMMARY:🏊 团体技术自选
 LOCATION:水上运动中心
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
-DESCRIPTION:冲浪 - 男子半决赛 - 第2组
-SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T174600Z-cycling-track-7-8-POL-CAN
 DTSTAMP:20240805T174600Z
 DTSTART:20240805T174600Z
@@ -28900,15 +28882,6 @@ SUMMARY:🤽 法国 🇫🇷 - 🇪🇸 西班牙
 LOCATION:拉德芳斯体育馆
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
-DESCRIPTION:冲浪 - 女子半决赛 - 第1组
-SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T183000Z-athletics-
 DTSTAMP:20240805T183000Z
 DTSTART:20240805T183000Z
@@ -28939,15 +28912,6 @@ SUMMARY:🏃 女子200米半决赛
 LOCATION:法兰西体育场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
-DESCRIPTION:冲浪 - 女子半决赛 - 第2组
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T190000Z-wrestling-60-KGZ-JPN
 DTSTAMP:20240805T190000Z
 DTSTART:20240805T190000Z
@@ -29034,15 +28998,6 @@ SUMMARY:🤼 MENG Lingzhe 🇨🇳 - 🇨🇱 Yasmani ACOSTA FERNANDEZ
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:冲浪 - 男子铜牌赛
-SUMMARY:🏄 男子铜牌赛
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T192800Z-wrestling-68-USA-PRK
 DTSTAMP:20240805T192800Z
 DTSTART:20240805T192800Z
@@ -29108,15 +29063,6 @@ SUMMARY:🏐 CHERIF/AHMED 🇶🇦 - 🇨🇱 M.GRIMALT/E.GRIMALT
 LOCATION:埃菲尔铁塔体育场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:冲浪 - 女子铜牌赛
-SUMMARY:🏄 女子铜牌赛
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball--FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -29126,19 +29072,73 @@ SUMMARY:🏀 法国 🇫🇷 - 🇳🇱 荷兰
 LOCATION:协和广场1号场地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
+DESCRIPTION:冲浪 - 男子半决赛 - 第1组
+SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
+DESCRIPTION:冲浪 - 男子半决赛 - 第2组
+SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
+DESCRIPTION:冲浪 - 女子半决赛 - 第1组
+SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
+DESCRIPTION:冲浪 - 女子半决赛 - 第2组
+SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T225400Z-surfing-
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:冲浪 - 男子铜牌赛
+SUMMARY:🏄 男子铜牌赛
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing-
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:冲浪 - 女子铜牌赛
+SUMMARY:🏄 女子铜牌赛
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:冲浪 - 男子金牌赛
 SUMMARY:🏄 男子金牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:冲浪 - 女子金牌赛
 SUMMARY:🏄 女子金牌赛
 LOCATION:特乎普欧，大溪地
@@ -29374,15 +29374,6 @@ SUMMARY:🤼 男子古典式130公斤复活赛
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling-60
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:摔跤 - 男子古典式60公斤复活赛
-SUMMARY:🤼 男子古典式60公斤复活赛
-LOCATION:战神广场
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090000Z-canoe-sprint-500
 DTSTAMP:20240806T090000Z
 DTSTART:20240806T090000Z
diff --git a/docs/ja/medals.html b/docs/ja/medals.html
index e6bdd6053..6c6b04904 100644
--- a/docs/ja/medals.html
+++ b/docs/ja/medals.html
@@ -343,12 +343,17 @@
     <span class="inline-block flex-auto">🇺🇸 United States</span>
     <span class="inline-block text-center w-1/6 flex-none">19</span>
     <span class="inline-block text-center w-1/6 flex-none">29</span>
-    <span class="inline-block text-center w-1/6 flex-none">27</span>
-    <span class="inline-block text-center w-1/6 flex-none">75</span>
+    <span class="inline-block text-center w-1/6 flex-none">28</span>
+    <span class="inline-block text-center w-1/6 flex-none">76</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>アメリカ合衆国</td>
+      <td>3x3 バスケットボール - 女子3位決定戦</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>United States 1</td>
@@ -2678,6 +2683,32 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇦🇿 Azerbaijan</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Zelym KOTSOIEV</td>
+      <td>柔道 - 男子100kg級決勝</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Hidayat HEYDAROV</td>
+      <td>柔道 - 男子73kg級決勝</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2730,32 +2761,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇦🇿 Azerbaijan</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Zelym KOTSOIEV</td>
-      <td>柔道 - 男子100kg級決勝</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Hidayat HEYDAROV</td>
-      <td>柔道 - 男子73kg級決勝</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2984,43 +2989,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇰🇿 Kazakhstan</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">4</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Nariman KURBANOV</td>
-      <td>体操競技 - 男子種目別あん馬決勝</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Gusman KYRGYZBAYEV</td>
-      <td>柔道 - 男子66kg級3位決定戦A</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Yeldos SMETOV</td>
-      <td>柔道 - 男子60kg級決勝</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Kazakhstan 1</td>
-      <td>射撃 - 混合10mエアライフル団体３位決定戦</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3058,6 +3026,43 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇰🇿 Kazakhstan</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Nariman KURBANOV</td>
+      <td>体操競技 - 男子種目別あん馬決勝</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Gusman KYRGYZBAYEV</td>
+      <td>柔道 - 男子66kg級3位決定戦A</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Yeldos SMETOV</td>
+      <td>柔道 - 男子60kg級決勝</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Kazakhstan 1</td>
+      <td>射撃 - 混合10mエアライフル団体３位決定戦</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3204,46 +3209,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇦🇷 Argentina</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-31</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Jose TORRES GIL</td>
-      <td>自転車BMXフリースタイル - 男子パーク決勝</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇩🇿 Algeria</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Kaylia NEMOUR</td>
-      <td>体操競技 - 女子種目別段違い平行棒決勝</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3327,7 +3292,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇱 Chile</span>
+    <span class="inline-block flex-auto">🇦🇷 Argentina</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3335,11 +3300,11 @@
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-31</td></tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>Francisca CROVETTO CHADID</td>
-      <td>射撃 - 女子スキート個人ファイナル</td>
+      <td>Jose TORRES GIL</td>
+      <td>自転車BMXフリースタイル - 男子パーク決勝</td>
     </tr>
   </table>
   </div>
@@ -3364,6 +3329,46 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇩🇿 Algeria</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Kaylia NEMOUR</td>
+      <td>体操競技 - 女子種目別段違い平行棒決勝</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇨🇱 Chile</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Francisca CROVETTO CHADID</td>
+      <td>射撃 - 女子スキート個人ファイナル</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3540,32 +3545,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇷 Türkiye</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Türkiye 2</td>
-      <td>射撃 - 混合10mエアピストル団体決勝戦</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>トルコ</td>
-      <td>アーチェリー - 男子団体3位決定戦</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3595,7 +3574,53 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
+    <span class="inline-block flex-auto">🇹🇷 Türkiye</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Türkiye 2</td>
+      <td>射撃 - 混合10mエアピストル団体決勝戦</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>トルコ</td>
+      <td>アーチェリー - 男子団体3位決定戦</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Berihu AREGAWI</td>
+      <td>陸上競技 - 男子10000m決勝</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇲🇳 Mongolia</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3606,8 +3631,8 @@
     <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
     <tr>
       <td class="silver">&#9679;</td>
-      <td>Fares FERJANI</td>
-      <td>フェンシング - 男子サーブル個人決勝</td>
+      <td>Baasankhuu BAVUUDORJ</td>
+      <td>柔道 - 女子48kg級決勝</td>
     </tr>
   </table>
   </div>
@@ -3675,27 +3700,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Berihu AREGAWI</td>
-      <td>陸上競技 - 男子10000m決勝</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇳 Mongolia</span>
+    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3706,8 +3711,8 @@
     <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
     <tr>
       <td class="silver">&#9679;</td>
-      <td>Baasankhuu BAVUUDORJ</td>
-      <td>柔道 - 女子48kg級決勝</td>
+      <td>Fares FERJANI</td>
+      <td>フェンシング - 男子サーブル個人決勝</td>
     </tr>
   </table>
   </div>
@@ -3732,38 +3737,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇮🇳 India</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Swapnil KUSALE</td>
-      <td>射撃 - 男子50mライフル3姿勢個人ファイナル</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>India 1</td>
-      <td>射撃 - 混合10mエアピストル団体３位決定戦</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Manu BHAKER</td>
-      <td>射撃 - 女子10mエアピストル個人ファイナル</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3799,25 +3772,31 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
+    <span class="inline-block flex-auto">🇮🇳 India</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">3</span>
+    <span class="inline-block text-center w-1/6 flex-none">3</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Zii Jia LEE</td>
-      <td>バドミントン - 男子シングルス3位決定戦</td>
+      <td>Swapnil KUSALE</td>
+      <td>射撃 - 男子50mライフル3姿勢個人ファイナル</td>
     </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>CHIA/SOH</td>
-      <td>バドミントン - 男子ダブルス3位決定戦</td>
+      <td>India 1</td>
+      <td>射撃 - 混合10mエアピストル団体３位決定戦</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Manu BHAKER</td>
+      <td>射撃 - 女子10mエアピストル個人ファイナル</td>
     </tr>
   </table>
   </div>
@@ -3876,39 +3855,25 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Mohamed ELSAYED</td>
-      <td>フェンシング - 男子エペ個人３位決定戦</td>
+      <td>Zii Jia LEE</td>
+      <td>バドミントン - 男子シングルス3位決定戦</td>
     </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇱🇹 Lithuania</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Viktorija SENKUTE</td>
-      <td>ローイング - 女子シングルスカル決勝A</td>
+      <td>CHIA/SOH</td>
+      <td>バドミントン - 男子ダブルス3位決定戦</td>
     </tr>
   </table>
   </div>
@@ -3993,6 +3958,46 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇱🇹 Lithuania</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Viktorija SENKUTE</td>
+      <td>ローイング - 女子シングルスカル決勝A</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Mohamed ELSAYED</td>
+      <td>フェンシング - 男子エペ個人３位決定戦</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
diff --git a/docs/ja/today.html b/docs/ja/today.html
index 17dca768b..c89e4b9b2 100644
--- a/docs/ja/today.html
+++ b/docs/ja/today.html
@@ -57772,24 +57772,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T170000Z" data-end="20240805T173000Z" data-noc="FRA,PER">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   サーフィン
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
-   </div>
-   <div>男子準決勝 - 第1ヒート</div>
-    <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇫🇷
-      Kauli VAAST
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T170000Z" data-end="20240805T192700Z" data-noc="AUS,CHN,GER,GRE,LAT,NED,NOR,PHI,SWE,TUR,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -57899,24 +57881,6 @@
     <div class="competitor JPN">🇯🇵 日本 </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T173600Z" data-end="20240805T180600Z" data-noc="AUS,BRA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   サーフィン
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
-   </div>
-   <div>男子準決勝 - 第2ヒート</div>
-    <div class="competitors">
-      Gabriel MEDINA
-      🇧🇷
-      -
-      🇦🇺
-      Jack ROBINSON
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T174600Z" data-end="20240805T175000Z" data-noc="CAN,POL">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58153,24 +58117,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T181200Z" data-end="20240805T184200Z" data-noc="FRA,USA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   サーフィン
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女性</span>
-   </div>
-   <div>女子準決勝 - 第1ヒート</div>
-    <div class="competitors">
-      Caroline MARKS
-      🇺🇸
-      -
-      🇫🇷
-      Johanne DEFAY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T183000Z" data-end="20240805T194000Z" data-noc="CHN,CRO,FRA,GER,ITA,MDA,NED,POR,SWE,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58229,24 +58175,6 @@
     <div class="competitor AUS">🇦🇺 Torrie LEWIS </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T184800Z" data-end="20240805T191800Z" data-noc="BRA,CRC">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   サーフィン
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女性</span>
-   </div>
-   <div>女子準決勝 - 第2ヒート</div>
-    <div class="competitors">
-      Tatiana WESTON-WEBB
-      🇧🇷
-      -
-      🇨🇷
-      Brisa HENNESSY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T190000Z" data-end="20240805T190700Z" data-noc="JPN,KGZ">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58418,17 +58346,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T192400Z" data-end="20240805T195900Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   サーフィン
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
-   </div>
-   <div>男子3位決定戦</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T192800Z" data-end="20240805T193500Z" data-noc="PRK,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58556,17 +58473,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T200500Z" data-end="20240805T204000Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   サーフィン
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女性</span>
-   </div>
-   <div>女子3位決定戦</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T203000Z" data-end="20240805T205500Z" data-noc="FRA,NED">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58585,7 +58491,101 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T204600Z" data-end="20240805T212100Z" data-noc="">
+<div class="event py-4" data-start="20240805T203000Z" data-end="20240805T210000Z" data-noc="FRA,PER">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   サーフィン
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
+   </div>
+   <div>男子準決勝 - 第1ヒート</div>
+    <div class="competitors">
+      Alonso CORREA
+      🇵🇪
+      -
+      🇫🇷
+      Kauli VAAST
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T210600Z" data-end="20240805T213600Z" data-noc="AUS,BRA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   サーフィン
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
+   </div>
+   <div>男子準決勝 - 第2ヒート</div>
+    <div class="competitors">
+      Gabriel MEDINA
+      🇧🇷
+      -
+      🇦🇺
+      Jack ROBINSON
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T214200Z" data-end="20240805T221200Z" data-noc="FRA,USA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   サーフィン
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女性</span>
+   </div>
+   <div>女子準決勝 - 第1ヒート</div>
+    <div class="competitors">
+      Caroline MARKS
+      🇺🇸
+      -
+      🇫🇷
+      Johanne DEFAY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T221800Z" data-end="20240805T224800Z" data-noc="BRA,CRC">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   サーフィン
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女性</span>
+   </div>
+   <div>女子準決勝 - 第2ヒート</div>
+    <div class="competitors">
+      Tatiana WESTON-WEBB
+      🇧🇷
+      -
+      🇨🇷
+      Brisa HENNESSY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T225400Z" data-end="20240805T232900Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   サーフィン
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
+   </div>
+   <div>男子3位決定戦</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T233500Z" data-end="20240806T001000Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   サーフィン
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女性</span>
+   </div>
+   <div>女子3位決定戦</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240806T001600Z" data-end="20240806T005100Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -58596,7 +58596,7 @@
    <div>男子決勝戦</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T212700Z" data-end="20240805T220200Z" data-noc="">
+<div class="event py-4" data-start="20240806T005700Z" data-end="20240806T013200Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -59086,17 +59086,6 @@
    <div>男子グレコローマンスタイル130kg級敗者復活戦</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T090000Z" data-end="20240806T090700Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   レスリング
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
-   </div>
-   <div>男子グレコローマンスタイル60kg級敗者復活戦</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240806T090000Z" data-end="20240806T091700Z" data-noc="CAN,CHI,CHN,CUB,ESP,FRA,GER,HUN,KAZ,MDA,NGR,POL,UKR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
diff --git a/docs/ko/medals.html b/docs/ko/medals.html
index 1315a6829..42d64c49e 100644
--- a/docs/ko/medals.html
+++ b/docs/ko/medals.html
@@ -343,12 +343,17 @@
     <span class="inline-block flex-auto">🇺🇸 United States</span>
     <span class="inline-block text-center w-1/6 flex-none">19</span>
     <span class="inline-block text-center w-1/6 flex-none">29</span>
-    <span class="inline-block text-center w-1/6 flex-none">27</span>
-    <span class="inline-block text-center w-1/6 flex-none">75</span>
+    <span class="inline-block text-center w-1/6 flex-none">28</span>
+    <span class="inline-block text-center w-1/6 flex-none">76</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>미국</td>
+      <td>3X3 농구 - 여자 동메달 결정전</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>United States 1</td>
@@ -1313,13 +1318,13 @@
     </tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>영국</td>
-      <td>조정 - 여자 쿼드러플스컬 결승 A</td>
+      <td>Alex YEE</td>
+      <td>트라이애슬론 - 남자 개인</td>
     </tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>Alex YEE</td>
-      <td>트라이애슬론 - 남자 개인</td>
+      <td>영국</td>
+      <td>조정 - 여자 쿼드러플스컬 결승 A</td>
     </tr>
     <tr>
       <td class="bronze">&#9679;</td>
@@ -2678,6 +2683,32 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇦🇿 Azerbaijan</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Zelym KOTSOIEV</td>
+      <td>유도 - 남자 -100kg 결승</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Hidayat HEYDAROV</td>
+      <td>유도 - 남자 -73kg 결승</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2730,32 +2761,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇦🇿 Azerbaijan</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Zelym KOTSOIEV</td>
-      <td>유도 - 남자 -100kg 결승</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Hidayat HEYDAROV</td>
-      <td>유도 - 남자 -73kg 결승</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2984,43 +2989,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇰🇿 Kazakhstan</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">4</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Nariman KURBANOV</td>
-      <td>기계체조 - 남자 안마 결승</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Gusman KYRGYZBAYEV</td>
-      <td>유도 - 남자 -66kg 동메달 결정전 A</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Yeldos SMETOV</td>
-      <td>유도 - 남자 -60kg 결승</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Kazakhstan 1</td>
-      <td>사격 - 혼성 단체 10m 공기소총 동메달 결정전</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3058,6 +3026,43 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇰🇿 Kazakhstan</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Nariman KURBANOV</td>
+      <td>기계체조 - 남자 안마 결승</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Gusman KYRGYZBAYEV</td>
+      <td>유도 - 남자 -66kg 동메달 결정전 A</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Yeldos SMETOV</td>
+      <td>유도 - 남자 -60kg 결승</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Kazakhstan 1</td>
+      <td>사격 - 혼성 단체 10m 공기소총 동메달 결정전</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3153,6 +3158,31 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇨🇿 Czechia</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>SINIAKOVA/MACHAC</td>
+      <td>테니스 - 혼성 복식 금메달 결정전</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>체코</td>
+      <td>펜싱 - 남자 에페 단체 동메달 결정전</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3182,24 +3212,19 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇿 Czechia</span>
+    <span class="inline-block flex-auto">🇸🇮 Slovenia</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>SINIAKOVA/MACHAC</td>
-      <td>테니스 - 혼성 복식 금메달 결정전</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>체코</td>
-      <td>펜싱 - 남자 에페 단체 동메달 결정전</td>
+      <td>Andreja LESKI</td>
+      <td>유도 - 여자 -63kg 결승</td>
     </tr>
   </table>
   </div>
@@ -3344,26 +3369,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇸🇮 Slovenia</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Andreja LESKI</td>
-      <td>유도 - 여자 -63kg 결승</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3395,38 +3400,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇽 Mexico</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>멕시코</td>
-      <td>다이빙 - 남자 싱크로나이즈드 3m 스프링보드</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Prisca AWITI ALCARAZ</td>
-      <td>유도 - 여자 -63kg 결승</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>멕시코</td>
-      <td>양궁 - 여자 단체 동메달 결정전</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3459,6 +3432,38 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇲🇽 Mexico</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">3</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>멕시코</td>
+      <td>다이빙 - 남자 싱크로나이즈드 3m 스프링보드</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Prisca AWITI ALCARAZ</td>
+      <td>유도 - 여자 -63kg 결승</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>멕시코</td>
+      <td>양궁 - 여자 단체 동메달 결정전</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3592,6 +3597,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇲🇳 Mongolia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Baasankhuu BAVUUDORJ</td>
+      <td>유도 - 여자 -48kg 결승</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3612,6 +3637,46 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇹🇭 Thailand</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Kunlavut VITIDSARN</td>
+      <td>배드민턴 - 남자 단식 금메달 결정전</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Fares FERJANI</td>
+      <td>펜싱 - 남자 사브르 개인 금메달 결정전</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3675,59 +3740,31 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇳 Mongolia</span>
+    <span class="inline-block flex-auto">🇹🇯 Tajikistan</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">3</span>
+    <span class="inline-block text-center w-1/6 flex-none">3</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Baasankhuu BAVUUDORJ</td>
-      <td>유도 - 여자 -48kg 결승</td>
+      <td class="bronze">&#9679;</td>
+      <td>Davlat BOLTAEV</td>
+      <td>복싱 - 남자 92kg - 준결승</td>
     </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Fares FERJANI</td>
-      <td>펜싱 - 남자 사브르 개인 금메달 결정전</td>
+      <td class="bronze">&#9679;</td>
+      <td>Temur RAKHIMOV</td>
+      <td>유도 - 남자 +100kg 동메달 결정전 A</td>
     </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇭 Thailand</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Kunlavut VITIDSARN</td>
-      <td>배드민턴 - 남자 단식 금메달 결정전</td>
+      <td class="bronze">&#9679;</td>
+      <td>Somon MAKHMADBEKOV</td>
+      <td>유도 - 남자 -81kg 동메달 결정전 B</td>
     </tr>
   </table>
   </div>
@@ -3767,31 +3804,25 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇯 Tajikistan</span>
+    <span class="inline-block flex-auto">🇲🇩 Moldova</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Davlat BOLTAEV</td>
-      <td>복싱 - 남자 92kg - 준결승</td>
+      <td>Adil OSMANOV</td>
+      <td>유도 - 남자 -73kg 동메달 결정전 A</td>
     </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Temur RAKHIMOV</td>
-      <td>유도 - 남자 +100kg 동메달 결정전 A</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Somon MAKHMADBEKOV</td>
-      <td>유도 - 남자 -81kg 동메달 결정전 B</td>
+      <td>Denis VIERU</td>
+      <td>유도 - 남자 -66kg 동메달 결정전 B</td>
     </tr>
   </table>
   </div>
@@ -3821,32 +3852,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇩 Moldova</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Adil OSMANOV</td>
-      <td>유도 - 남자 -73kg 동메달 결정전 A</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Denis VIERU</td>
-      <td>유도 - 남자 -66kg 동메달 결정전 B</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3873,66 +3878,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇺 Cuba</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Arlen LOPEZ CARDONA</td>
-      <td>복싱 - 남자 80kg - 준결승</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇻 Cabo Verde</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>David de PINA</td>
-      <td>복싱 - 남자 51kg - 준결승</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇸🇰 Slovakia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Matej BENUS</td>
-      <td>카누 슬라럼 - 남자 카누 1인승 결승</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3976,7 +3921,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block flex-auto">🇨🇺 Cuba</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
@@ -3984,11 +3929,31 @@
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Mohamed ELSAYED</td>
-      <td>펜싱 - 남자 에페 개인 동메달 결정전</td>
+      <td>Arlen LOPEZ CARDONA</td>
+      <td>복싱 - 남자 80kg - 준결승</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇨🇻 Cabo Verde</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>David de PINA</td>
+      <td>복싱 - 남자 51kg - 준결승</td>
     </tr>
   </table>
   </div>
@@ -4012,6 +3977,46 @@
     </tr>
   </table>
   </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Mohamed ELSAYED</td>
+      <td>펜싱 - 남자 에페 개인 동메달 결정전</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇸🇰 Slovakia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Matej BENUS</td>
+      <td>카누 슬라럼 - 남자 카누 1인승 결승</td>
+    </tr>
+  </table>
+  </div>
 </div>
     </div>
 
diff --git a/docs/ko/today.html b/docs/ko/today.html
index dc27bbc82..3c93b430f 100644
--- a/docs/ko/today.html
+++ b/docs/ko/today.html
@@ -57772,24 +57772,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T170000Z" data-end="20240805T173000Z" data-noc="FRA,PER">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   서핑
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
-   </div>
-   <div>남자 준결승 - 1조</div>
-    <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇫🇷
-      Kauli VAAST
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T170000Z" data-end="20240805T192700Z" data-noc="AUS,CHN,GER,GRE,LAT,NED,NOR,PHI,SWE,TUR,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -57899,24 +57881,6 @@
     <div class="competitor FRA">🇫🇷 프랑스 </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T173600Z" data-end="20240805T180600Z" data-noc="AUS,BRA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   서핑
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
-   </div>
-   <div>남자 준결승 - 2조</div>
-    <div class="competitors">
-      Gabriel MEDINA
-      🇧🇷
-      -
-      🇦🇺
-      Jack ROBINSON
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T174600Z" data-end="20240805T175000Z" data-noc="CAN,POL">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58153,24 +58117,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T181200Z" data-end="20240805T184200Z" data-noc="FRA,USA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   서핑
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">여성</span>
-   </div>
-   <div>여자 준결승 - 1조</div>
-    <div class="competitors">
-      Caroline MARKS
-      🇺🇸
-      -
-      🇫🇷
-      Johanne DEFAY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T183000Z" data-end="20240805T194000Z" data-noc="CHN,CRO,FRA,GER,ITA,MDA,NED,POR,SWE,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58229,24 +58175,6 @@
     <div class="competitor AUS">🇦🇺 Torrie LEWIS </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T184800Z" data-end="20240805T191800Z" data-noc="BRA,CRC">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   서핑
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">여성</span>
-   </div>
-   <div>여자 준결승 - 2조</div>
-    <div class="competitors">
-      Tatiana WESTON-WEBB
-      🇧🇷
-      -
-      🇨🇷
-      Brisa HENNESSY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T190000Z" data-end="20240805T190700Z" data-noc="JPN,KGZ">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58418,17 +58346,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T192400Z" data-end="20240805T195900Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   서핑
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
-   </div>
-   <div>남자 동메달 결정전</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T192800Z" data-end="20240805T193500Z" data-noc="PRK,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58556,17 +58473,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T200500Z" data-end="20240805T204000Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   서핑
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">여성</span>
-   </div>
-   <div>여자 동메달 결정전</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T203000Z" data-end="20240805T205500Z" data-noc="FRA,NED">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58585,7 +58491,101 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T204600Z" data-end="20240805T212100Z" data-noc="">
+<div class="event py-4" data-start="20240805T203000Z" data-end="20240805T210000Z" data-noc="FRA,PER">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   서핑
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
+   </div>
+   <div>남자 준결승 - 1조</div>
+    <div class="competitors">
+      Alonso CORREA
+      🇵🇪
+      -
+      🇫🇷
+      Kauli VAAST
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T210600Z" data-end="20240805T213600Z" data-noc="AUS,BRA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   서핑
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
+   </div>
+   <div>남자 준결승 - 2조</div>
+    <div class="competitors">
+      Gabriel MEDINA
+      🇧🇷
+      -
+      🇦🇺
+      Jack ROBINSON
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T214200Z" data-end="20240805T221200Z" data-noc="FRA,USA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   서핑
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">여성</span>
+   </div>
+   <div>여자 준결승 - 1조</div>
+    <div class="competitors">
+      Caroline MARKS
+      🇺🇸
+      -
+      🇫🇷
+      Johanne DEFAY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T221800Z" data-end="20240805T224800Z" data-noc="BRA,CRC">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   서핑
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">여성</span>
+   </div>
+   <div>여자 준결승 - 2조</div>
+    <div class="competitors">
+      Tatiana WESTON-WEBB
+      🇧🇷
+      -
+      🇨🇷
+      Brisa HENNESSY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T225400Z" data-end="20240805T232900Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   서핑
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
+   </div>
+   <div>남자 동메달 결정전</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T233500Z" data-end="20240806T001000Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   서핑
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">여성</span>
+   </div>
+   <div>여자 동메달 결정전</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240806T001600Z" data-end="20240806T005100Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -58596,7 +58596,7 @@
    <div>남자 금메달 결정전</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T212700Z" data-end="20240805T220200Z" data-noc="">
+<div class="event py-4" data-start="20240806T005700Z" data-end="20240806T013200Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -59080,17 +59080,6 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
    
-   레슬링
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
-   </div>
-   <div>남자 그레코로만형 60kg 패자부활전</div>
- </div>
-</div>
-<div class="event py-4" data-start="20240806T090000Z" data-end="20240806T090700Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
    레슬링
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">여성</span>
    </div>
diff --git a/docs/medals.html b/docs/medals.html
index 2217b5aaa..6d6ee365f 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -343,12 +343,17 @@
     <span class="inline-block flex-auto">🇺🇸 United States</span>
     <span class="inline-block text-center w-1/6 flex-none">19</span>
     <span class="inline-block text-center w-1/6 flex-none">29</span>
-    <span class="inline-block text-center w-1/6 flex-none">27</span>
-    <span class="inline-block text-center w-1/6 flex-none">75</span>
+    <span class="inline-block text-center w-1/6 flex-none">28</span>
+    <span class="inline-block text-center w-1/6 flex-none">76</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>United States</td>
+      <td>3x3 Basketball - Women's Bronze Medal Game</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>United States 1</td>
@@ -3264,26 +3269,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇩🇿 Algeria</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Kaylia NEMOUR</td>
-      <td>Artistic Gymnastics - Women's Uneven Bars Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3364,6 +3349,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇩🇿 Algeria</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Kaylia NEMOUR</td>
+      <td>Artistic Gymnastics - Women's Uneven Bars Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3592,26 +3597,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Fares FERJANI</td>
-      <td>Fencing - Men's Sabre Individual Gold Medal Bout</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3652,6 +3637,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Fares FERJANI</td>
+      <td>Fencing - Men's Sabre Individual Gold Medal Bout</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3672,6 +3677,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Berihu AREGAWI</td>
+      <td>Athletics - Men's 10,000m Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3712,26 +3737,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Berihu AREGAWI</td>
-      <td>Athletics - Men's 10,000m Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3873,26 +3878,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Mohamed ELSAYED</td>
-      <td>Fencing - Men's Épée Individual Bronze Medal Bout</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3973,6 +3958,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Mohamed ELSAYED</td>
+      <td>Fencing - Men's Épée Individual Bronze Medal Bout</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
diff --git a/docs/medals/general.ics b/docs/medals/general.ics
index 7e609fb6f..2472e3dd5 100644
--- a/docs/medals/general.ics
+++ b/docs/medals/general.ics
@@ -2791,15 +2791,6 @@ SUMMARY:🏃 Women's 5000m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-MENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:Surfing - Men's Bronze Medal Match
-SUMMARY:🏄 Men's Bronze Medal Match
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T193000Z-3x3-basketball-MENS-BRONZE-MEDAL-GAME-LAT-LTU
 DTSTAMP:20240805T193000Z
 DTSTART:20240805T193000Z
@@ -2829,15 +2820,6 @@ SUMMARY:🏀 GER 🇩🇪 - 🇪🇸 ESP
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:Surfing - Women's Bronze Medal Match
-SUMMARY:🏄 Women's Bronze Medal Match
-LOCATION:Teahupo'o, Tahiti
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball-MENS-GOLD-MEDAL-GAME-FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -2847,19 +2829,37 @@ SUMMARY:🏀 FRA 🇫🇷 - 🇳🇱 NED
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-MENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T225400Z-surfing-MENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:Surfing - Men's Bronze Medal Match
+SUMMARY:🏄 Men's Bronze Medal Match
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:Surfing - Women's Bronze Medal Match
+SUMMARY:🏄 Women's Bronze Medal Match
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing-MENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Surfing - Men's Gold Medal Match
 SUMMARY:🏄 Men's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Surfing - Women's Gold Medal Match
 SUMMARY:🏄 Women's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/medals/ja/general.ics b/docs/medals/ja/general.ics
index fa1759b68..5e0616700 100644
--- a/docs/medals/ja/general.ics
+++ b/docs/medals/ja/general.ics
@@ -2757,15 +2757,6 @@ SUMMARY:🏃 女子5000m決勝
 LOCATION:スタッド・ド・フランス
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-3
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:サーフィン - 男子3位決定戦
-SUMMARY:🏄 男子3位決定戦
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T193000Z-3x3-basketball-3-LAT-LTU
 DTSTAMP:20240805T193000Z
 DTSTART:20240805T193000Z
@@ -2795,15 +2786,6 @@ SUMMARY:🏀 ドイツ 🇩🇪 - 🇪🇸 スペイン
 LOCATION:コンコルド広場1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-3
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:サーフィン - 女子3位決定戦
-SUMMARY:🏄 女子3位決定戦
-LOCATION:タウポ、タヒチ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball--FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -2813,19 +2795,37 @@ SUMMARY:🏀 フランス 🇫🇷 - 🇳🇱 オランダ
 LOCATION:コンコルド広場1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T225400Z-surfing-3
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:サーフィン - 男子3位決定戦
+SUMMARY:🏄 男子3位決定戦
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing-3
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:サーフィン - 女子3位決定戦
+SUMMARY:🏄 女子3位決定戦
+LOCATION:タウポ、タヒチ
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:サーフィン - 男子決勝戦
 SUMMARY:🏄 男子決勝戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:サーフィン - 女子決勝戦
 SUMMARY:🏄 女子決勝戦
 LOCATION:タウポ、タヒチ
diff --git a/docs/medals/ko/general.ics b/docs/medals/ko/general.ics
index facaf6214..3f9e77092 100644
--- a/docs/medals/ko/general.ics
+++ b/docs/medals/ko/general.ics
@@ -2757,15 +2757,6 @@ SUMMARY:🏃 여자 5000m 결승
 LOCATION:스타드 드 프랑스
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:서핑 - 남자 동메달 결정전
-SUMMARY:🏄 남자 동메달 결정전
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T193000Z-3x3-basketball---LAT-LTU
 DTSTAMP:20240805T193000Z
 DTSTART:20240805T193000Z
@@ -2795,15 +2786,6 @@ SUMMARY:🏀 독일 🇩🇪 - 🇪🇸 스페인
 LOCATION:라 콩코르드 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:서핑 - 여자 동메달 결정전
-SUMMARY:🏄 여자 동메달 결정전
-LOCATION:타히티, 테아후푸
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball---FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -2813,19 +2795,37 @@ SUMMARY:🏀 프랑스 🇫🇷 - 🇳🇱 네덜란드
 LOCATION:라 콩코르드 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:서핑 - 남자 동메달 결정전
+SUMMARY:🏄 남자 동메달 결정전
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:서핑 - 여자 동메달 결정전
+SUMMARY:🏄 여자 동메달 결정전
+LOCATION:타히티, 테아후푸
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:서핑 - 남자 금메달 결정전
 SUMMARY:🏄 남자 금메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:서핑 - 여자 금메달 결정전
 SUMMARY:🏄 여자 금메달 결정전
 LOCATION:타히티, 테아후푸
diff --git a/docs/medals/ru/general.ics b/docs/medals/ru/general.ics
index 493be9492..378cfd4fd 100644
--- a/docs/medals/ru/general.ics
+++ b/docs/medals/ru/general.ics
@@ -2826,15 +2826,6 @@ SUMMARY:🏃 5000м, финал (ж)
 LOCATION:«Стад-де-Франс»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:Серфинг - Поединок за бронзу (м)
-SUMMARY:🏄 Поединок за бронзу (м)
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T193000Z-3x3-basketball--3--LAT-LTU
 DTSTAMP:20240805T193000Z
 DTSTART:20240805T193000Z
@@ -2865,15 +2856,6 @@ SUMMARY:🏀 Германия 🇩🇪 - 🇪🇸 Испания
 LOCATION:Площадь Согласия 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:Серфинг - Поединок за бронзу (ж)
-SUMMARY:🏄 Поединок за бронзу (ж)
-LOCATION:Теахупоо, Таити
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball---FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -2883,19 +2865,37 @@ SUMMARY:🏀 Франция 🇫🇷 - 🇳🇱 Нидерланды
 LOCATION:Площадь Согласия 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:Серфинг - Поединок за бронзу (м)
+SUMMARY:🏄 Поединок за бронзу (м)
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:Серфинг - Поединок за бронзу (ж)
+SUMMARY:🏄 Поединок за бронзу (ж)
+LOCATION:Теахупоо, Таити
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Серфинг - Финал (м)
 SUMMARY:🏄 Финал (м)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Серфинг - Финал (ж)
 SUMMARY:🏄 Финал (ж)
 LOCATION:Теахупоо, Таити
diff --git a/docs/medals/zh/general.ics b/docs/medals/zh/general.ics
index 2718ab492..c84505b24 100644
--- a/docs/medals/zh/general.ics
+++ b/docs/medals/zh/general.ics
@@ -2754,15 +2754,6 @@ SUMMARY:🏃 女子5000米决赛
 LOCATION:法兰西体育场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
-DESCRIPTION:冲浪 - 男子铜牌赛
-SUMMARY:🏄 男子铜牌赛
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T193000Z-3x3-basketball--LAT-LTU
 DTSTAMP:20240805T193000Z
 DTSTART:20240805T193000Z
@@ -2792,15 +2783,6 @@ SUMMARY:🏀 德国 🇩🇪 - 🇪🇸 西班牙
 LOCATION:协和广场1号场地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
-DESCRIPTION:冲浪 - 女子铜牌赛
-SUMMARY:🏄 女子铜牌赛
-LOCATION:特乎普欧，大溪地
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T203000Z-3x3-basketball--FRA-NED
 DTSTAMP:20240805T203000Z
 DTSTART:20240805T203000Z
@@ -2810,19 +2792,37 @@ SUMMARY:🏀 法国 🇫🇷 - 🇳🇱 荷兰
 LOCATION:协和广场1号场地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240805T225400Z-surfing-
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
+DESCRIPTION:冲浪 - 男子铜牌赛
+SUMMARY:🏄 男子铜牌赛
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240805T233500Z-surfing-
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
+DESCRIPTION:冲浪 - 女子铜牌赛
+SUMMARY:🏄 女子铜牌赛
+LOCATION:特乎普欧，大溪地
+END:VEVENT
+BEGIN:VEVENT
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:冲浪 - 男子金牌赛
 SUMMARY:🏄 男子金牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:冲浪 - 女子金牌赛
 SUMMARY:🏄 女子金牌赛
 LOCATION:特乎普欧，大溪地
diff --git a/docs/ru/medals.html b/docs/ru/medals.html
index fce0905f6..15c72c9a1 100644
--- a/docs/ru/medals.html
+++ b/docs/ru/medals.html
@@ -343,12 +343,17 @@
     <span class="inline-block flex-auto">🇺🇸 United States</span>
     <span class="inline-block text-center w-1/6 flex-none">19</span>
     <span class="inline-block text-center w-1/6 flex-none">29</span>
-    <span class="inline-block text-center w-1/6 flex-none">27</span>
-    <span class="inline-block text-center w-1/6 flex-none">75</span>
+    <span class="inline-block text-center w-1/6 flex-none">28</span>
+    <span class="inline-block text-center w-1/6 flex-none">76</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>США</td>
+      <td>Баскетбол 3х3 - Матч за 3-е место (ж)</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>United States 1</td>
@@ -2704,32 +2709,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇷🇸 Serbia</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Novak DJOKOVIC</td>
-      <td>Теннис - Финал, одиночный разряд (м)</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Serbia</td>
-      <td>Стрельба - Пневматический пистолет 10м, золото (микст)</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2756,6 +2735,32 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇷🇸 Serbia</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Novak DJOKOVIC</td>
+      <td>Теннис - Финал, одиночный разряд (м)</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Serbia</td>
+      <td>Стрельба - Пневматический пистолет 10м, золото (микст)</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3153,6 +3158,31 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇨🇿 Czechia</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>SINIAKOVA/MACHAC</td>
+      <td>Теннис - Финал (микст)</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Чехия</td>
+      <td>Фехтование - Командная шпага, за 3-е место (м)</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3182,24 +3212,19 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇿 Czechia</span>
+    <span class="inline-block flex-auto">🇸🇮 Slovenia</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>SINIAKOVA/MACHAC</td>
-      <td>Теннис - Финал (микст)</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Чехия</td>
-      <td>Фехтование - Командная шпага, за 3-е место (м)</td>
+      <td>Andreja LESKI</td>
+      <td>Дзюдо - Финал, до 63кг (ж)</td>
     </tr>
   </table>
   </div>
@@ -3287,7 +3312,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇸🇮 Slovenia</span>
+    <span class="inline-block flex-auto">🇩🇿 Algeria</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3295,31 +3320,11 @@
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>Andreja LESKI</td>
-      <td>Дзюдо - Финал, до 63кг (ж)</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇦🇷 Argentina</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-31</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Jose TORRES GIL</td>
-      <td>ВМХ-фристайл - Парк, финал (м)</td>
+      <td>Kaylia NEMOUR</td>
+      <td>Спортивная гимнастика - Разновысокие брусья, финал (ж)</td>
     </tr>
   </table>
   </div>
@@ -3347,7 +3352,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇩🇿 Algeria</span>
+    <span class="inline-block flex-auto">🇦🇷 Argentina</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3355,11 +3360,11 @@
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-31</td></tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>Kaylia NEMOUR</td>
-      <td>Спортивная гимнастика - Разновысокие брусья, финал (ж)</td>
+      <td>Jose TORRES GIL</td>
+      <td>ВМХ-фристайл - Парк, финал (м)</td>
     </tr>
   </table>
   </div>
@@ -3592,46 +3597,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Berihu AREGAWI</td>
-      <td>Легкая атлетика - 10000м, финал (м)</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Fares FERJANI</td>
-      <td>Фехтование - Личная сабля, финал (м)</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3655,7 +3620,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇫🇯 Fiji</span>
+    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3663,11 +3628,11 @@
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
     <tr>
       <td class="silver">&#9679;</td>
-      <td>Фиджи</td>
-      <td>Регби-7 - Финал (м)</td>
+      <td>Berihu AREGAWI</td>
+      <td>Легкая атлетика - 10000м, финал (м)</td>
     </tr>
   </table>
   </div>
@@ -3692,6 +3657,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇫🇯 Fiji</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Фиджи</td>
+      <td>Регби-7 - Финал (м)</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3732,6 +3717,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Fares FERJANI</td>
+      <td>Фехтование - Личная сабля, финал (м)</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3822,32 +3827,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Zii Jia LEE</td>
-      <td>Бадминтон - Матч за 3-е место, одиночный (м)</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>CHIA/SOH</td>
-      <td>Бадминтон - Матч за 3-е место, парный (м)</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3876,39 +3855,25 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Mohamed ELSAYED</td>
-      <td>Фехтование - Личная шпага, за 3-е место (м)</td>
+      <td>Zii Jia LEE</td>
+      <td>Бадминтон - Матч за 3-е место, одиночный (м)</td>
     </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇱🇹 Lithuania</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
     <tr>
       <td class="bronze">&#9679;</td>
-      <td>Viktorija SENKUTE</td>
-      <td>Академическая гребля - Одиночки, финал A (ж)</td>
+      <td>CHIA/SOH</td>
+      <td>Бадминтон - Матч за 3-е место, парный (м)</td>
     </tr>
   </table>
   </div>
@@ -3953,26 +3918,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇸🇰 Slovakia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Matej BENUS</td>
-      <td>Гребной слалом - Каноэ-одиночки, финал (м)</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -4012,6 +3957,66 @@
     </tr>
   </table>
   </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇸🇰 Slovakia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Matej BENUS</td>
+      <td>Гребной слалом - Каноэ-одиночки, финал (м)</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Mohamed ELSAYED</td>
+      <td>Фехтование - Личная шпага, за 3-е место (м)</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇱🇹 Lithuania</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-03</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Viktorija SENKUTE</td>
+      <td>Академическая гребля - Одиночки, финал A (ж)</td>
+    </tr>
+  </table>
+  </div>
 </div>
     </div>
 
diff --git a/docs/ru/today.html b/docs/ru/today.html
index 7c61496fd..6697e63c2 100644
--- a/docs/ru/today.html
+++ b/docs/ru/today.html
@@ -57772,24 +57772,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T170000Z" data-end="20240805T173000Z" data-noc="FRA,PER">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   СЕРФИНГ
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
-   </div>
-   <div>Полуфиналы, заезд 1 (м)</div>
-    <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇫🇷
-      Kauli VAAST
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T170000Z" data-end="20240805T192700Z" data-noc="AUS,CHN,GER,GRE,LAT,NED,NOR,PHI,SWE,TUR,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -57899,24 +57881,6 @@
     <div class="competitor JPN">🇯🇵 Япония </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T173600Z" data-end="20240805T180600Z" data-noc="AUS,BRA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   СЕРФИНГ
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
-   </div>
-   <div>Полуфиналы, заезд 2 (м)</div>
-    <div class="competitors">
-      Gabriel MEDINA
-      🇧🇷
-      -
-      🇦🇺
-      Jack ROBINSON
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T174600Z" data-end="20240805T175000Z" data-noc="CAN,POL">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58153,24 +58117,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T181200Z" data-end="20240805T184200Z" data-noc="FRA,USA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   СЕРФИНГ
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">Ж</span>
-   </div>
-   <div>Полуфиналы, заезд 1 (ж)</div>
-    <div class="competitors">
-      Caroline MARKS
-      🇺🇸
-      -
-      🇫🇷
-      Johanne DEFAY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T183000Z" data-end="20240805T194000Z" data-noc="CHN,CRO,FRA,GER,ITA,MDA,NED,POR,SWE,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58229,24 +58175,6 @@
     <div class="competitor AUS">🇦🇺 Torrie LEWIS </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T184800Z" data-end="20240805T191800Z" data-noc="BRA,CRC">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   СЕРФИНГ
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">Ж</span>
-   </div>
-   <div>Полуфиналы, заезд 2 (ж)</div>
-    <div class="competitors">
-      Tatiana WESTON-WEBB
-      🇧🇷
-      -
-      🇨🇷
-      Brisa HENNESSY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T190000Z" data-end="20240805T190700Z" data-noc="JPN,KGZ">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58418,17 +58346,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T192400Z" data-end="20240805T195900Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   СЕРФИНГ
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
-   </div>
-   <div>Поединок за бронзу (м)</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T192800Z" data-end="20240805T193500Z" data-noc="PRK,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58556,17 +58473,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T200500Z" data-end="20240805T204000Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   СЕРФИНГ
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">Ж</span>
-   </div>
-   <div>Поединок за бронзу (ж)</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T203000Z" data-end="20240805T205500Z" data-noc="FRA,NED">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58585,7 +58491,101 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T204600Z" data-end="20240805T212100Z" data-noc="">
+<div class="event py-4" data-start="20240805T203000Z" data-end="20240805T210000Z" data-noc="FRA,PER">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   СЕРФИНГ
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
+   </div>
+   <div>Полуфиналы, заезд 1 (м)</div>
+    <div class="competitors">
+      Alonso CORREA
+      🇵🇪
+      -
+      🇫🇷
+      Kauli VAAST
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T210600Z" data-end="20240805T213600Z" data-noc="AUS,BRA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   СЕРФИНГ
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
+   </div>
+   <div>Полуфиналы, заезд 2 (м)</div>
+    <div class="competitors">
+      Gabriel MEDINA
+      🇧🇷
+      -
+      🇦🇺
+      Jack ROBINSON
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T214200Z" data-end="20240805T221200Z" data-noc="FRA,USA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   СЕРФИНГ
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">Ж</span>
+   </div>
+   <div>Полуфиналы, заезд 1 (ж)</div>
+    <div class="competitors">
+      Caroline MARKS
+      🇺🇸
+      -
+      🇫🇷
+      Johanne DEFAY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T221800Z" data-end="20240805T224800Z" data-noc="BRA,CRC">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   СЕРФИНГ
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">Ж</span>
+   </div>
+   <div>Полуфиналы, заезд 2 (ж)</div>
+    <div class="competitors">
+      Tatiana WESTON-WEBB
+      🇧🇷
+      -
+      🇨🇷
+      Brisa HENNESSY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T225400Z" data-end="20240805T232900Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   СЕРФИНГ
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
+   </div>
+   <div>Поединок за бронзу (м)</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T233500Z" data-end="20240806T001000Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   СЕРФИНГ
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">Ж</span>
+   </div>
+   <div>Поединок за бронзу (ж)</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240806T001600Z" data-end="20240806T005100Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -58596,7 +58596,7 @@
    <div>Финал (м)</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T212700Z" data-end="20240805T220200Z" data-noc="">
+<div class="event py-4" data-start="20240806T005700Z" data-end="20240806T013200Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -59086,17 +59086,6 @@
    <div>Греко-римская, 130кг, утешительный раунд (м)</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T090000Z" data-end="20240806T090700Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   БОРЬБА
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
-   </div>
-   <div>Греко-римская, 60кг, утешительный раунд (м)</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240806T090000Z" data-end="20240806T091700Z" data-noc="CAN,CHI,CHN,CUB,ESP,FRA,GER,HUN,KAZ,MDA,NGR,POL,UKR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
diff --git a/docs/surfing/AUS.ics b/docs/surfing/AUS.ics
index 11c9507a9..1a91b11e3 100644
--- a/docs/surfing/AUS.ics
+++ b/docs/surfing/AUS.ics
@@ -107,10 +107,10 @@ SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇦🇺 Tyler WRIGHT
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:Surfing - Men's Semifinals - Heat 2
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/BRA.ics b/docs/surfing/BRA.ics
index 2f2891eba..6a39ae8d2 100644
--- a/docs/surfing/BRA.ics
+++ b/docs/surfing/BRA.ics
@@ -153,19 +153,19 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:Surfing - Men's Semifinals - Heat 2
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Surfing - Women's Semifinals - Heat 2
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/CRC.ics b/docs/surfing/CRC.ics
index e13fb8117..93fd945fe 100644
--- a/docs/surfing/CRC.ics
+++ b/docs/surfing/CRC.ics
@@ -32,10 +32,10 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Surfing - Women's Semifinals - Heat 2
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/FRA.ics b/docs/surfing/FRA.ics
index 5dfad0a3c..0d255007d 100644
--- a/docs/surfing/FRA.ics
+++ b/docs/surfing/FRA.ics
@@ -107,19 +107,19 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Surfing - Men's Semifinals - Heat 1
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:Surfing - Women's Semifinals - Heat 1
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/PER.ics b/docs/surfing/PER.ics
index aa2e54688..3eede980b 100644
--- a/docs/surfing/PER.ics
+++ b/docs/surfing/PER.ics
@@ -70,10 +70,10 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Surfing - Men's Semifinals - Heat 1
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/USA.ics b/docs/surfing/USA.ics
index 09b523385..607caefc6 100644
--- a/docs/surfing/USA.ics
+++ b/docs/surfing/USA.ics
@@ -117,10 +117,10 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:Surfing - Women's Semifinals - Heat 1
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index fe5b0bc26..0ac647d16 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -524,73 +524,73 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing-MENS-SEMIFINALS-HEAT-1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Surfing - Men's Semifinals - Heat 1
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing-MENS-SEMIFINALS-HEAT-2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:Surfing - Men's Semifinals - Heat 2
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing-WOMENS-SEMIFINALS-HEAT-1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:Surfing - Women's Semifinals - Heat 1
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing-WOMENS-SEMIFINALS-HEAT-2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Surfing - Women's Semifinals - Heat 2
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-MENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing-MENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:Surfing - Men's Bronze Medal Match
 SUMMARY:🏄 Men's Bronze Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:Surfing - Women's Bronze Medal Match
 SUMMARY:🏄 Women's Bronze Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-MENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing-MENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Surfing - Men's Gold Medal Match
 SUMMARY:🏄 Men's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Surfing - Women's Gold Medal Match
 SUMMARY:🏄 Women's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/ja/AUS.ics b/docs/surfing/ja/AUS.ics
index bace31f6f..1a78be4b7 100644
--- a/docs/surfing/ja/AUS.ics
+++ b/docs/surfing/ja/AUS.ics
@@ -107,10 +107,10 @@ SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇦🇺 Tyler WRIGHT
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ja/BRA.ics b/docs/surfing/ja/BRA.ics
index 521a3598b..0bfdbf179 100644
--- a/docs/surfing/ja/BRA.ics
+++ b/docs/surfing/ja/BRA.ics
@@ -153,19 +153,19 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ja/CRC.ics b/docs/surfing/ja/CRC.ics
index 9381491ed..cb99265e2 100644
--- a/docs/surfing/ja/CRC.ics
+++ b/docs/surfing/ja/CRC.ics
@@ -32,10 +32,10 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ja/FRA.ics b/docs/surfing/ja/FRA.ics
index 7d3fe6570..257f8b632 100644
--- a/docs/surfing/ja/FRA.ics
+++ b/docs/surfing/ja/FRA.ics
@@ -107,19 +107,19 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ja/PER.ics b/docs/surfing/ja/PER.ics
index 2d434bce8..9e47225bf 100644
--- a/docs/surfing/ja/PER.ics
+++ b/docs/surfing/ja/PER.ics
@@ -70,10 +70,10 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ja/USA.ics b/docs/surfing/ja/USA.ics
index 8348f0632..0e7ddcf7d 100644
--- a/docs/surfing/ja/USA.ics
+++ b/docs/surfing/ja/USA.ics
@@ -117,10 +117,10 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ja/general.ics b/docs/surfing/ja/general.ics
index 03fa74594..b3642ab6b 100644
--- a/docs/surfing/ja/general.ics
+++ b/docs/surfing/ja/general.ics
@@ -524,73 +524,73 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:サーフィン - 男子準決勝 - 第1ヒート
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:サーフィン - 男子準決勝 - 第2ヒート
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:サーフィン - 女子準決勝 - 第1ヒート
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:サーフィン - 女子準決勝 - 第2ヒート
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-3
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing-3
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:サーフィン - 男子3位決定戦
 SUMMARY:🏄 男子3位決定戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-3
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing-3
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:サーフィン - 女子3位決定戦
 SUMMARY:🏄 女子3位決定戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:サーフィン - 男子決勝戦
 SUMMARY:🏄 男子決勝戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:サーフィン - 女子決勝戦
 SUMMARY:🏄 女子決勝戦
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ja/medals.ics b/docs/surfing/ja/medals.ics
index 1b2921cbf..665affd7a 100644
--- a/docs/surfing/ja/medals.ics
+++ b/docs/surfing/ja/medals.ics
@@ -4,37 +4,37 @@ PRODID:-//fabrice404//olympics-calendar//surfing/ja/medals//EN
 X-WR-CALNAME:🏄 サーフィン 🏅 | Paris 2024
 NAME:🏄 サーフィン 🏅 | Paris 2024
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-3
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing-3
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:サーフィン - 男子3位決定戦
 SUMMARY:🏄 男子3位決定戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-3
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing-3
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:サーフィン - 女子3位決定戦
 SUMMARY:🏄 女子3位決定戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:サーフィン - 男子決勝戦
 SUMMARY:🏄 男子決勝戦
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:サーフィン - 女子決勝戦
 SUMMARY:🏄 女子決勝戦
 LOCATION:タウポ、タヒチ
diff --git a/docs/surfing/ko/AUS.ics b/docs/surfing/ko/AUS.ics
index 19f0c2865..149bdc2dd 100644
--- a/docs/surfing/ko/AUS.ics
+++ b/docs/surfing/ko/AUS.ics
@@ -107,10 +107,10 @@ SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇦🇺 Tyler WRIGHT
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:서핑 - 남자 준결승 - 2조
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/ko/BRA.ics b/docs/surfing/ko/BRA.ics
index e8229a447..c16864228 100644
--- a/docs/surfing/ko/BRA.ics
+++ b/docs/surfing/ko/BRA.ics
@@ -153,19 +153,19 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:서핑 - 남자 준결승 - 2조
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:서핑 - 여자 준결승 - 2조
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/ko/CRC.ics b/docs/surfing/ko/CRC.ics
index 6e34ffa5c..6e1d2a1a9 100644
--- a/docs/surfing/ko/CRC.ics
+++ b/docs/surfing/ko/CRC.ics
@@ -32,10 +32,10 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:서핑 - 여자 준결승 - 2조
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/ko/FRA.ics b/docs/surfing/ko/FRA.ics
index 864c37cc1..e8a578ef0 100644
--- a/docs/surfing/ko/FRA.ics
+++ b/docs/surfing/ko/FRA.ics
@@ -107,19 +107,19 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:서핑 - 남자 준결승 - 1조
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:서핑 - 여자 준결승 - 1조
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/ko/PER.ics b/docs/surfing/ko/PER.ics
index b81825305..532414cd9 100644
--- a/docs/surfing/ko/PER.ics
+++ b/docs/surfing/ko/PER.ics
@@ -70,10 +70,10 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:서핑 - 남자 준결승 - 1조
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/ko/USA.ics b/docs/surfing/ko/USA.ics
index 843ac14ca..372a46f9a 100644
--- a/docs/surfing/ko/USA.ics
+++ b/docs/surfing/ko/USA.ics
@@ -117,10 +117,10 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:서핑 - 여자 준결승 - 1조
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/ko/general.ics b/docs/surfing/ko/general.ics
index 9e1141601..717f93a13 100644
--- a/docs/surfing/ko/general.ics
+++ b/docs/surfing/ko/general.ics
@@ -524,73 +524,73 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:서핑 - 남자 준결승 - 1조
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:서핑 - 남자 준결승 - 2조
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:서핑 - 여자 준결승 - 1조
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:서핑 - 여자 준결승 - 2조
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:서핑 - 남자 동메달 결정전
 SUMMARY:🏄 남자 동메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:서핑 - 여자 동메달 결정전
 SUMMARY:🏄 여자 동메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:서핑 - 남자 금메달 결정전
 SUMMARY:🏄 남자 금메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:서핑 - 여자 금메달 결정전
 SUMMARY:🏄 여자 금메달 결정전
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/ko/medals.ics b/docs/surfing/ko/medals.ics
index 667029922..adde098d3 100644
--- a/docs/surfing/ko/medals.ics
+++ b/docs/surfing/ko/medals.ics
@@ -4,37 +4,37 @@ PRODID:-//fabrice404//olympics-calendar//surfing/ko/medals//EN
 X-WR-CALNAME:🏄 서핑 🏅 | Paris 2024
 NAME:🏄 서핑 🏅 | Paris 2024
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:서핑 - 남자 동메달 결정전
 SUMMARY:🏄 남자 동메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:서핑 - 여자 동메달 결정전
 SUMMARY:🏄 여자 동메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:서핑 - 남자 금메달 결정전
 SUMMARY:🏄 남자 금메달 결정전
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:서핑 - 여자 금메달 결정전
 SUMMARY:🏄 여자 금메달 결정전
 LOCATION:타히티, 테아후푸
diff --git a/docs/surfing/medals.ics b/docs/surfing/medals.ics
index bd017a9f1..affbc9437 100644
--- a/docs/surfing/medals.ics
+++ b/docs/surfing/medals.ics
@@ -4,37 +4,37 @@ PRODID:-//fabrice404//olympics-calendar//surfing/medals//EN
 X-WR-CALNAME:🏄 Surfing 🏅 | Paris 2024
 NAME:🏄 Surfing 🏅 | Paris 2024
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-MENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing-MENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:Surfing - Men's Bronze Medal Match
 SUMMARY:🏄 Men's Bronze Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing-WOMENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:Surfing - Women's Bronze Medal Match
 SUMMARY:🏄 Women's Bronze Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-MENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing-MENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Surfing - Men's Gold Medal Match
 SUMMARY:🏄 Men's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-WOMENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Surfing - Women's Gold Medal Match
 SUMMARY:🏄 Women's Gold Medal Match
 LOCATION:Teahupo'o, Tahiti
diff --git a/docs/surfing/ru/AUS.ics b/docs/surfing/ru/AUS.ics
index 9d044f119..07a4013f2 100644
--- a/docs/surfing/ru/AUS.ics
+++ b/docs/surfing/ru/AUS.ics
@@ -107,10 +107,10 @@ SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇦🇺 Tyler WRIGHT
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2--BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2--BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/ru/BRA.ics b/docs/surfing/ru/BRA.ics
index f0653a104..506ab77c1 100644
--- a/docs/surfing/ru/BRA.ics
+++ b/docs/surfing/ru/BRA.ics
@@ -153,19 +153,19 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2--BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2--BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2--BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2--BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/ru/CRC.ics b/docs/surfing/ru/CRC.ics
index c35a28930..dd493fbbc 100644
--- a/docs/surfing/ru/CRC.ics
+++ b/docs/surfing/ru/CRC.ics
@@ -32,10 +32,10 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2--BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2--BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/ru/FRA.ics b/docs/surfing/ru/FRA.ics
index 78297cc31..a499d54e2 100644
--- a/docs/surfing/ru/FRA.ics
+++ b/docs/surfing/ru/FRA.ics
@@ -107,19 +107,19 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1--PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1--PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1--USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1--USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/ru/PER.ics b/docs/surfing/ru/PER.ics
index e15f9e06d..53de7e405 100644
--- a/docs/surfing/ru/PER.ics
+++ b/docs/surfing/ru/PER.ics
@@ -70,10 +70,10 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1--PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1--PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/ru/USA.ics b/docs/surfing/ru/USA.ics
index 402726fbf..50b33adce 100644
--- a/docs/surfing/ru/USA.ics
+++ b/docs/surfing/ru/USA.ics
@@ -117,10 +117,10 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1--USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1--USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/ru/general.ics b/docs/surfing/ru/general.ics
index 8545849df..b8306362d 100644
--- a/docs/surfing/ru/general.ics
+++ b/docs/surfing/ru/general.ics
@@ -524,73 +524,73 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1--PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1--PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (м)
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2--BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2--BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (м)
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1--USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1--USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 1 (ж)
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2--BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2--BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:Серфинг - Полуфиналы, заезд 2 (ж)
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:Серфинг - Поединок за бронзу (м)
 SUMMARY:🏄 Поединок за бронзу (м)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:Серфинг - Поединок за бронзу (ж)
 SUMMARY:🏄 Поединок за бронзу (ж)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Серфинг - Финал (м)
 SUMMARY:🏄 Финал (м)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Серфинг - Финал (ж)
 SUMMARY:🏄 Финал (ж)
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/ru/medals.ics b/docs/surfing/ru/medals.ics
index 02b8014bb..d69bd393c 100644
--- a/docs/surfing/ru/medals.ics
+++ b/docs/surfing/ru/medals.ics
@@ -4,37 +4,37 @@ PRODID:-//fabrice404//olympics-calendar//surfing/ru/medals//EN
 X-WR-CALNAME:🏄 Серфинг 🏅 | Paris 2024
 NAME:🏄 Серфинг 🏅 | Paris 2024
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing--
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing--
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:Серфинг - Поединок за бронзу (м)
 SUMMARY:🏄 Поединок за бронзу (м)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing--
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing--
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:Серфинг - Поединок за бронзу (ж)
 SUMMARY:🏄 Поединок за бронзу (ж)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing--
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing--
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:Серфинг - Финал (м)
 SUMMARY:🏄 Финал (м)
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing--
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing--
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:Серфинг - Финал (ж)
 SUMMARY:🏄 Финал (ж)
 LOCATION:Теахупоо, Таити
diff --git a/docs/surfing/zh/AUS.ics b/docs/surfing/zh/AUS.ics
index ea523c9d2..a9f993daf 100644
--- a/docs/surfing/zh/AUS.ics
+++ b/docs/surfing/zh/AUS.ics
@@ -107,10 +107,10 @@ SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇦🇺 Tyler WRIGHT
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:冲浪 - 男子半决赛 - 第2组
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:特乎普欧，大溪地
diff --git a/docs/surfing/zh/BRA.ics b/docs/surfing/zh/BRA.ics
index 5c7cdb2cb..4373ffbe1 100644
--- a/docs/surfing/zh/BRA.ics
+++ b/docs/surfing/zh/BRA.ics
@@ -153,19 +153,19 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:冲浪 - 男子半决赛 - 第2组
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:冲浪 - 女子半决赛 - 第2组
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:特乎普欧，大溪地
diff --git a/docs/surfing/zh/CRC.ics b/docs/surfing/zh/CRC.ics
index 35de6a967..aae6a71e2 100644
--- a/docs/surfing/zh/CRC.ics
+++ b/docs/surfing/zh/CRC.ics
@@ -32,10 +32,10 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:冲浪 - 女子半决赛 - 第2组
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:特乎普欧，大溪地
diff --git a/docs/surfing/zh/FRA.ics b/docs/surfing/zh/FRA.ics
index a62ceeb8a..a48e5187e 100644
--- a/docs/surfing/zh/FRA.ics
+++ b/docs/surfing/zh/FRA.ics
@@ -107,19 +107,19 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:冲浪 - 男子半决赛 - 第1组
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:冲浪 - 女子半决赛 - 第1组
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:特乎普欧，大溪地
diff --git a/docs/surfing/zh/PER.ics b/docs/surfing/zh/PER.ics
index 0a41f7a5b..9a8d1ddba 100644
--- a/docs/surfing/zh/PER.ics
+++ b/docs/surfing/zh/PER.ics
@@ -70,10 +70,10 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:冲浪 - 男子半决赛 - 第1组
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:特乎普欧，大溪地
diff --git a/docs/surfing/zh/USA.ics b/docs/surfing/zh/USA.ics
index ccebee04e..87a685995 100644
--- a/docs/surfing/zh/USA.ics
+++ b/docs/surfing/zh/USA.ics
@@ -117,10 +117,10 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇺🇸 Carissa MOORE
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:冲浪 - 女子半决赛 - 第1组
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:特乎普欧，大溪地
diff --git a/docs/surfing/zh/general.ics b/docs/surfing/zh/general.ics
index 9250310d4..ee5660a1c 100644
--- a/docs/surfing/zh/general.ics
+++ b/docs/surfing/zh/general.ics
@@ -524,73 +524,73 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇧🇷 Luana SILVA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T170000Z-surfing--1-PER-FRA
-DTSTAMP:20240805T170000Z
-DTSTART:20240805T170000Z
-DTEND:20240805T173000Z
+UID:20240805T203000Z-surfing--1-PER-FRA
+DTSTAMP:20240805T203000Z
+DTSTART:20240805T203000Z
+DTEND:20240805T210000Z
 DESCRIPTION:冲浪 - 男子半决赛 - 第1组
 SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇫🇷 Kauli VAAST
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T173600Z-surfing--2-BRA-AUS
-DTSTAMP:20240805T173600Z
-DTSTART:20240805T173600Z
-DTEND:20240805T180600Z
+UID:20240805T210600Z-surfing--2-BRA-AUS
+DTSTAMP:20240805T210600Z
+DTSTART:20240805T210600Z
+DTEND:20240805T213600Z
 DESCRIPTION:冲浪 - 男子半决赛 - 第2组
 SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇦🇺 Jack ROBINSON
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T181200Z-surfing--1-USA-FRA
-DTSTAMP:20240805T181200Z
-DTSTART:20240805T181200Z
-DTEND:20240805T184200Z
+UID:20240805T214200Z-surfing--1-USA-FRA
+DTSTAMP:20240805T214200Z
+DTSTART:20240805T214200Z
+DTEND:20240805T221200Z
 DESCRIPTION:冲浪 - 女子半决赛 - 第1组
 SUMMARY:🏄 Caroline MARKS 🇺🇸 - 🇫🇷 Johanne DEFAY
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T184800Z-surfing--2-BRA-CRC
-DTSTAMP:20240805T184800Z
-DTSTART:20240805T184800Z
-DTEND:20240805T191800Z
+UID:20240805T221800Z-surfing--2-BRA-CRC
+DTSTAMP:20240805T221800Z
+DTSTART:20240805T221800Z
+DTEND:20240805T224800Z
 DESCRIPTION:冲浪 - 女子半决赛 - 第2组
 SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇨🇷 Brisa HENNESSY
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing-
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:冲浪 - 男子铜牌赛
 SUMMARY:🏄 男子铜牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing-
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:冲浪 - 女子铜牌赛
 SUMMARY:🏄 女子铜牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:冲浪 - 男子金牌赛
 SUMMARY:🏄 男子金牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:冲浪 - 女子金牌赛
 SUMMARY:🏄 女子金牌赛
 LOCATION:特乎普欧，大溪地
diff --git a/docs/surfing/zh/medals.ics b/docs/surfing/zh/medals.ics
index d1bc75578..fa439fa31 100644
--- a/docs/surfing/zh/medals.ics
+++ b/docs/surfing/zh/medals.ics
@@ -4,37 +4,37 @@ PRODID:-//fabrice404//olympics-calendar//surfing/zh/medals//EN
 X-WR-CALNAME:🏄 冲浪 🏅 | Paris 2024
 NAME:🏄 冲浪 🏅 | Paris 2024
 BEGIN:VEVENT
-UID:20240805T192400Z-surfing-
-DTSTAMP:20240805T192400Z
-DTSTART:20240805T192400Z
-DTEND:20240805T195900Z
+UID:20240805T225400Z-surfing-
+DTSTAMP:20240805T225400Z
+DTSTART:20240805T225400Z
+DTEND:20240805T232900Z
 DESCRIPTION:冲浪 - 男子铜牌赛
 SUMMARY:🏄 男子铜牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T200500Z-surfing-
-DTSTAMP:20240805T200500Z
-DTSTART:20240805T200500Z
-DTEND:20240805T204000Z
+UID:20240805T233500Z-surfing-
+DTSTAMP:20240805T233500Z
+DTSTART:20240805T233500Z
+DTEND:20240806T001000Z
 DESCRIPTION:冲浪 - 女子铜牌赛
 SUMMARY:🏄 女子铜牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T204600Z-surfing-
-DTSTAMP:20240805T204600Z
-DTSTART:20240805T204600Z
-DTEND:20240805T212100Z
+UID:20240806T001600Z-surfing-
+DTSTAMP:20240806T001600Z
+DTSTART:20240806T001600Z
+DTEND:20240806T005100Z
 DESCRIPTION:冲浪 - 男子金牌赛
 SUMMARY:🏄 男子金牌赛
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T212700Z-surfing-
-DTSTAMP:20240805T212700Z
-DTSTART:20240805T212700Z
-DTEND:20240805T220200Z
+UID:20240806T005700Z-surfing-
+DTSTAMP:20240806T005700Z
+DTSTART:20240806T005700Z
+DTEND:20240806T013200Z
 DESCRIPTION:冲浪 - 女子金牌赛
 SUMMARY:🏄 女子金牌赛
 LOCATION:特乎普欧，大溪地
diff --git a/docs/today.html b/docs/today.html
index 2c9d1fa44..ed9fb561a 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -57772,24 +57772,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T170000Z" data-end="20240805T173000Z" data-noc="FRA,PER">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SURFING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Semifinals - Heat 1</div>
-    <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇫🇷
-      Kauli VAAST
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T170000Z" data-end="20240805T192700Z" data-noc="AUS,CHN,GER,GRE,LAT,NED,NOR,PHI,SWE,TUR,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -57899,24 +57881,6 @@
     <div class="competitor USA">🇺🇸 United States </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T173600Z" data-end="20240805T180600Z" data-noc="AUS,BRA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SURFING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Semifinals - Heat 2</div>
-    <div class="competitors">
-      Gabriel MEDINA
-      🇧🇷
-      -
-      🇦🇺
-      Jack ROBINSON
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T174600Z" data-end="20240805T175000Z" data-noc="CAN,POL">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58153,24 +58117,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T181200Z" data-end="20240805T184200Z" data-noc="FRA,USA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SURFING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div>Women's Semifinals - Heat 1</div>
-    <div class="competitors">
-      Caroline MARKS
-      🇺🇸
-      -
-      🇫🇷
-      Johanne DEFAY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T183000Z" data-end="20240805T194000Z" data-noc="CHN,CRO,FRA,GER,ITA,MDA,NED,POR,SWE,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58229,24 +58175,6 @@
     <div class="competitor AUS">🇦🇺 Torrie LEWIS </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T184800Z" data-end="20240805T191800Z" data-noc="BRA,CRC">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   SURFING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div>Women's Semifinals - Heat 2</div>
-    <div class="competitors">
-      Tatiana WESTON-WEBB
-      🇧🇷
-      -
-      🇨🇷
-      Brisa HENNESSY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T190000Z" data-end="20240805T190700Z" data-noc="JPN,KGZ">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58418,17 +58346,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T192400Z" data-end="20240805T195900Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   SURFING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Bronze Medal Match</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T192800Z" data-end="20240805T193500Z" data-noc="PRK,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58556,17 +58473,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T200500Z" data-end="20240805T204000Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   SURFING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div>Women's Bronze Medal Match</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T203000Z" data-end="20240805T205500Z" data-noc="FRA,NED">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58585,7 +58491,101 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T204600Z" data-end="20240805T212100Z" data-noc="">
+<div class="event py-4" data-start="20240805T203000Z" data-end="20240805T210000Z" data-noc="FRA,PER">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SURFING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Semifinals - Heat 1</div>
+    <div class="competitors">
+      Alonso CORREA
+      🇵🇪
+      -
+      🇫🇷
+      Kauli VAAST
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T210600Z" data-end="20240805T213600Z" data-noc="AUS,BRA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SURFING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Semifinals - Heat 2</div>
+    <div class="competitors">
+      Gabriel MEDINA
+      🇧🇷
+      -
+      🇦🇺
+      Jack ROBINSON
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T214200Z" data-end="20240805T221200Z" data-noc="FRA,USA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SURFING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div>Women's Semifinals - Heat 1</div>
+    <div class="competitors">
+      Caroline MARKS
+      🇺🇸
+      -
+      🇫🇷
+      Johanne DEFAY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T221800Z" data-end="20240805T224800Z" data-noc="BRA,CRC">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   SURFING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div>Women's Semifinals - Heat 2</div>
+    <div class="competitors">
+      Tatiana WESTON-WEBB
+      🇧🇷
+      -
+      🇨🇷
+      Brisa HENNESSY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T225400Z" data-end="20240805T232900Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   SURFING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Bronze Medal Match</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T233500Z" data-end="20240806T001000Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   SURFING
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div>Women's Bronze Medal Match</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240806T001600Z" data-end="20240806T005100Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -58596,7 +58596,7 @@
    <div>Men's Gold Medal Match</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T212700Z" data-end="20240805T220200Z" data-noc="">
+<div class="event py-4" data-start="20240806T005700Z" data-end="20240806T013200Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -59080,17 +59080,6 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
    
-   WRESTLING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Greco-Roman 60kg Repechage</div>
- </div>
-</div>
-<div class="event py-4" data-start="20240806T090000Z" data-end="20240806T090700Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
    WRESTLING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
diff --git a/docs/wrestling/general.ics b/docs/wrestling/general.ics
index 23c6f1705..12331beeb 100644
--- a/docs/wrestling/general.ics
+++ b/docs/wrestling/general.ics
@@ -400,15 +400,6 @@ SUMMARY:🤼 Men's Greco-Roman 130kg Repechage
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling-MENS-GRECO-ROMAN-60KG-REPECHAGE
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:Wrestling - Men's Greco-Roman 60kg Repechage
-SUMMARY:🤼 Men's Greco-Roman 60kg Repechage
-LOCATION:Champ-de-Mars Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090000Z-wrestling-WOMENS-FREESTYLE-68KG-REPECHAGE
 DTSTAMP:20240806T090000Z
 DTSTART:20240806T090000Z
diff --git a/docs/wrestling/ja/general.ics b/docs/wrestling/ja/general.ics
index 79beaa4bb..8e07ae387 100644
--- a/docs/wrestling/ja/general.ics
+++ b/docs/wrestling/ja/general.ics
@@ -409,15 +409,6 @@ SUMMARY:🤼 男子グレコローマンスタイル130kg級敗者復活戦
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling-60KG
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:レスリング - 男子グレコローマンスタイル60kg級敗者復活戦
-SUMMARY:🤼 男子グレコローマンスタイル60kg級敗者復活戦
-LOCATION:シャン・ド・マルス・アリーナ
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090700Z-wrestling-68KG
 DTSTAMP:20240806T090700Z
 DTSTART:20240806T090700Z
diff --git a/docs/wrestling/ko/general.ics b/docs/wrestling/ko/general.ics
index 1a4666d93..0fce04a36 100644
--- a/docs/wrestling/ko/general.ics
+++ b/docs/wrestling/ko/general.ics
@@ -400,15 +400,6 @@ SUMMARY:🤼 남자 그레코로만 130kg 패자부활전
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling--60KG-
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:레슬링 - 남자 그레코로만형 60kg 패자부활전
-SUMMARY:🤼 남자 그레코로만형 60kg 패자부활전
-LOCATION:샹드마르 아레나
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090000Z-wrestling--68KG-
 DTSTAMP:20240806T090000Z
 DTSTART:20240806T090000Z
diff --git a/docs/wrestling/ru/general.ics b/docs/wrestling/ru/general.ics
index 68b2dc1c8..66d885120 100644
--- a/docs/wrestling/ru/general.ics
+++ b/docs/wrestling/ru/general.ics
@@ -409,15 +409,6 @@ SUMMARY:🤼 Греко-римская, 130кг, утешительный рау
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling--60-
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:Борьба - Греко-римская, 60кг, утешительный раунд (м)
-SUMMARY:🤼 Греко-римская, 60кг, утешительный раунд (м)
-LOCATION:Арена «Марсово поле»
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090700Z-wrestling--68-
 DTSTAMP:20240806T090700Z
 DTSTART:20240806T090700Z
diff --git a/docs/wrestling/zh/general.ics b/docs/wrestling/zh/general.ics
index dc585eb72..ce4ca3ea8 100644
--- a/docs/wrestling/zh/general.ics
+++ b/docs/wrestling/zh/general.ics
@@ -409,15 +409,6 @@ SUMMARY:🤼 男子古典式130公斤复活赛
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T090000Z-wrestling-60
-DTSTAMP:20240806T090000Z
-DTSTART:20240806T090000Z
-DTEND:20240806T090700Z
-DESCRIPTION:摔跤 - 男子古典式60公斤复活赛
-SUMMARY:🤼 男子古典式60公斤复活赛
-LOCATION:战神广场
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T090700Z-wrestling-68
 DTSTAMP:20240806T090700Z
 DTSTART:20240806T090700Z
diff --git a/docs/zh/medals.html b/docs/zh/medals.html
index fd3654165..c7c476314 100644
--- a/docs/zh/medals.html
+++ b/docs/zh/medals.html
@@ -343,12 +343,17 @@
     <span class="inline-block flex-auto">🇺🇸 United States</span>
     <span class="inline-block text-center w-1/6 flex-none">19</span>
     <span class="inline-block text-center w-1/6 flex-none">29</span>
-    <span class="inline-block text-center w-1/6 flex-none">27</span>
-    <span class="inline-block text-center w-1/6 flex-none">75</span>
+    <span class="inline-block text-center w-1/6 flex-none">28</span>
+    <span class="inline-block text-center w-1/6 flex-none">76</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>美国</td>
+      <td>三人篮球 - 女子铜牌赛</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>United States 1</td>
@@ -2704,32 +2709,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇷🇸 Serbia</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Novak DJOKOVIC</td>
-      <td>网球 - 男子单打金牌赛</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Serbia</td>
-      <td>射击 - 混合团体10米气手枪金牌赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2756,6 +2735,32 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇷🇸 Serbia</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Novak DJOKOVIC</td>
+      <td>网球 - 男子单打金牌赛</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Serbia</td>
+      <td>射击 - 混合团体10米气手枪金牌赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2984,43 +2989,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇿🇦 South Africa</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">4</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Tatjana SMITH</td>
-      <td>游泳 - 女子200米蛙泳决赛</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Tatjana SMITH</td>
-      <td>游泳 - 女子100米蛙泳决赛</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Alan HATHERLY</td>
-      <td>山地自行车 - 男子越野赛</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>南非</td>
-      <td>七人制橄榄球 - 男子铜牌赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3058,6 +3026,43 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇿🇦 South Africa</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-01</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Tatjana SMITH</td>
+      <td>游泳 - 女子200米蛙泳决赛</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Tatjana SMITH</td>
+      <td>游泳 - 女子100米蛙泳决赛</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Alan HATHERLY</td>
+      <td>山地自行车 - 男子越野赛</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>南非</td>
+      <td>七人制橄榄球 - 男子铜牌赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3204,6 +3209,66 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇸🇮 Slovenia</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Andreja LESKI</td>
+      <td>柔道 - 女子63公斤级决赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇦🇷 Argentina</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-31</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Jose TORRES GIL</td>
+      <td>自由式小轮车 - 男子公园赛决赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇨🇱 Chile</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Francisca CROVETTO CHADID</td>
+      <td>射击 - 女子双向飞碟决赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3284,66 +3349,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇸🇮 Slovenia</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-30</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Andreja LESKI</td>
-      <td>柔道 - 女子63公斤级决赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇱 Chile</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Francisca CROVETTO CHADID</td>
-      <td>射击 - 女子双向飞碟决赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇦🇷 Argentina</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-31</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Jose TORRES GIL</td>
-      <td>自由式小轮车 - 男子公园赛决赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3595,7 +3600,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
+    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3603,31 +3608,11 @@
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
     <tr>
       <td class="silver">&#9679;</td>
-      <td>Berihu AREGAWI</td>
-      <td>田径 - 男子10000米决赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇭 Thailand</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Kunlavut VITIDSARN</td>
-      <td>羽毛球 - 男子单打金牌赛</td>
+      <td>Fares FERJANI</td>
+      <td>击剑 - 男子个人佩剑金牌赛</td>
     </tr>
   </table>
   </div>
@@ -3655,7 +3640,7 @@
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇹🇳 Tunisia</span>
+    <span class="inline-block flex-auto">🇹🇭 Thailand</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
@@ -3663,11 +3648,11 @@
   </div>
   <div class="collapse-content">
   <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-27</td></tr>
+    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
     <tr>
       <td class="silver">&#9679;</td>
-      <td>Fares FERJANI</td>
-      <td>击剑 - 男子个人佩剑金牌赛</td>
+      <td>Kunlavut VITIDSARN</td>
+      <td>羽毛球 - 男子单打金牌赛</td>
     </tr>
   </table>
   </div>
@@ -3692,6 +3677,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇹 Ethiopia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Berihu AREGAWI</td>
+      <td>田径 - 男子10000米决赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3796,32 +3801,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Zii Jia LEE</td>
-      <td>羽毛球 - 男子单打铜牌赛</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>CHIA/SOH</td>
-      <td>羽毛球 - 男子双打铜牌赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3848,6 +3827,32 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-05</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Zii Jia LEE</td>
+      <td>羽毛球 - 男子单打铜牌赛</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-04</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>CHIA/SOH</td>
+      <td>羽毛球 - 男子双打铜牌赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3873,6 +3878,26 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Mohamed ELSAYED</td>
+      <td>击剑 - 男子个人重剑铜牌赛</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3953,26 +3978,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇪🇬 Egypt</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Mohamed ELSAYED</td>
-      <td>击剑 - 男子个人重剑铜牌赛</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
diff --git a/docs/zh/today.html b/docs/zh/today.html
index 7081e47a9..af0e80715 100644
--- a/docs/zh/today.html
+++ b/docs/zh/today.html
@@ -57772,24 +57772,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T170000Z" data-end="20240805T173000Z" data-noc="FRA,PER">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   冲浪
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
-   </div>
-   <div>男子半决赛 - 第1组</div>
-    <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇫🇷
-      Kauli VAAST
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T170000Z" data-end="20240805T192700Z" data-noc="AUS,CHN,GER,GRE,LAT,NED,NOR,PHI,SWE,TUR,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -57899,24 +57881,6 @@
     <div class="competitor ESP">🇪🇸 西班牙 </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T173600Z" data-end="20240805T180600Z" data-noc="AUS,BRA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   冲浪
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
-   </div>
-   <div>男子半决赛 - 第2组</div>
-    <div class="competitors">
-      Gabriel MEDINA
-      🇧🇷
-      -
-      🇦🇺
-      Jack ROBINSON
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T174600Z" data-end="20240805T175000Z" data-noc="CAN,POL">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58153,24 +58117,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T181200Z" data-end="20240805T184200Z" data-noc="FRA,USA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   冲浪
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女</span>
-   </div>
-   <div>女子半决赛 - 第1组</div>
-    <div class="competitors">
-      Caroline MARKS
-      🇺🇸
-      -
-      🇫🇷
-      Johanne DEFAY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T183000Z" data-end="20240805T194000Z" data-noc="CHN,CRO,FRA,GER,ITA,MDA,NED,POR,SWE,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58229,24 +58175,6 @@
     <div class="competitor AUS">🇦🇺 Torrie LEWIS </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T184800Z" data-end="20240805T191800Z" data-noc="BRA,CRC">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   冲浪
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女</span>
-   </div>
-   <div>女子半决赛 - 第2组</div>
-    <div class="competitors">
-      Tatiana WESTON-WEBB
-      🇧🇷
-      -
-      🇨🇷
-      Brisa HENNESSY
-    </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T190000Z" data-end="20240805T190700Z" data-noc="JPN,KGZ">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58418,17 +58346,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T192400Z" data-end="20240805T195900Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   冲浪
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
-   </div>
-   <div>男子铜牌赛</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T192800Z" data-end="20240805T193500Z" data-noc="PRK,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58556,17 +58473,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T200500Z" data-end="20240805T204000Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   冲浪
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女</span>
-   </div>
-   <div>女子铜牌赛</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T203000Z" data-end="20240805T205500Z" data-noc="FRA,NED">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -58585,7 +58491,101 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T204600Z" data-end="20240805T212100Z" data-noc="">
+<div class="event py-4" data-start="20240805T203000Z" data-end="20240805T210000Z" data-noc="FRA,PER">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   冲浪
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
+   </div>
+   <div>男子半决赛 - 第1组</div>
+    <div class="competitors">
+      Alonso CORREA
+      🇵🇪
+      -
+      🇫🇷
+      Kauli VAAST
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T210600Z" data-end="20240805T213600Z" data-noc="AUS,BRA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   冲浪
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
+   </div>
+   <div>男子半决赛 - 第2组</div>
+    <div class="competitors">
+      Gabriel MEDINA
+      🇧🇷
+      -
+      🇦🇺
+      Jack ROBINSON
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T214200Z" data-end="20240805T221200Z" data-noc="FRA,USA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   冲浪
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女</span>
+   </div>
+   <div>女子半决赛 - 第1组</div>
+    <div class="competitors">
+      Caroline MARKS
+      🇺🇸
+      -
+      🇫🇷
+      Johanne DEFAY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T221800Z" data-end="20240805T224800Z" data-noc="BRA,CRC">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   冲浪
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女</span>
+   </div>
+   <div>女子半决赛 - 第2组</div>
+    <div class="competitors">
+      Tatiana WESTON-WEBB
+      🇧🇷
+      -
+      🇨🇷
+      Brisa HENNESSY
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T225400Z" data-end="20240805T232900Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   冲浪
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
+   </div>
+   <div>男子铜牌赛</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240805T233500Z" data-end="20240806T001000Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   🏅
+   冲浪
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">女</span>
+   </div>
+   <div>女子铜牌赛</div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240806T001600Z" data-end="20240806T005100Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -58596,7 +58596,7 @@
    <div>男子金牌赛</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T212700Z" data-end="20240805T220200Z" data-noc="">
+<div class="event py-4" data-start="20240806T005700Z" data-end="20240806T013200Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -59086,17 +59086,6 @@
    <div>男子古典式130公斤复活赛</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T090000Z" data-end="20240806T090700Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   摔跤
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
-   </div>
-   <div>男子古典式60公斤复活赛</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240806T090000Z" data-end="20240806T091700Z" data-noc="CAN,CHI,CHN,CUB,ESP,FRA,GER,HUN,KAZ,MDA,NGR,POL,UKR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">