From 887b731384e5304b53d310b11999a3ea45fa197d Mon Sep 17 00:00:00 2001
From: fabrice404 <fabrice404@users.noreply.github.com>
Date: Mon, 29 Jul 2024 18:45:38 +0000
Subject: [PATCH] calendar updates

---
 docs/athletics/general.ics | 208 +++++++++---------
 docs/athletics/medals.ics  | 152 ++++++-------
 docs/fencing/HKG.ics       |   7 +-
 docs/fencing/ITA.ics       |   9 +
 docs/fencing/JPN.ics       |   7 +-
 docs/fencing/USA.ics       |   9 +
 docs/fencing/general.ics   |  14 +-
 docs/fencing/medals.ics    |  14 +-
 docs/general/FRA.ics       |   4 +-
 docs/general/HKG.ics       |   7 +-
 docs/general/ITA.ics       |   9 +
 docs/general/JPN.ics       |   7 +-
 docs/general/USA.ics       |  13 +-
 docs/general/general.ics   | 390 +++++++++++++++++-----------------
 docs/medals/HKG.ics        |   7 +-
 docs/medals/ITA.ics        |   9 +
 docs/medals/JPN.ics        |   7 +-
 docs/medals/USA.ics        |   9 +
 docs/medals/general.ics    | 248 +++++++++++-----------
 docs/surfing/FRA.ics       |   4 +-
 docs/surfing/USA.ics       |   4 +-
 docs/surfing/general.ics   |   4 +-
 docs/today.html            | 422 ++++++++++++++++++-------------------
 23 files changed, 801 insertions(+), 763 deletions(-)

diff --git a/docs/athletics/general.ics b/docs/athletics/general.ics
index f8ad24bc5..6f9536304 100644
--- a/docs/athletics/general.ics
+++ b/docs/athletics/general.ics
@@ -67,10 +67,10 @@ SUMMARY:🏃 Men's Decathlon Long Jump
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240802T090500Z-athletics-MENS-1500M-ROUND-1
-DTSTAMP:20240802T090500Z
-DTSTART:20240802T090500Z
-DTEND:20240802T093100Z
+UID:20240802T091000Z-athletics-MENS-1500M-ROUND-1
+DTSTAMP:20240802T091000Z
+DTSTART:20240802T091000Z
+DTEND:20240802T093600Z
 DESCRIPTION:Athletics - Men's 1500m Round 1
 SUMMARY:🏃 Men's 1500m Round 1
 LOCATION:Stade de France
@@ -229,28 +229,28 @@ SUMMARY:🏃 Men's Decathlon Discus Throw - Group A
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240803T091000Z-athletics-WOMENS-800M-REPECHAGE-ROUND
-DTSTAMP:20240803T091000Z
-DTSTART:20240803T091000Z
-DTEND:20240803T093600Z
+UID:20240803T092000Z-athletics-WOMENS-800M-REPECHAGE-ROUND
+DTSTAMP:20240803T092000Z
+DTSTART:20240803T092000Z
+DTEND:20240803T094600Z
 DESCRIPTION:Athletics - Women's 800m Repechage Round
 SUMMARY:🏃 Women's 800m Repechage Round
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240803T094500Z-athletics-MENS-100M-ROUND-1
-DTSTAMP:20240803T094500Z
-DTSTART:20240803T094500Z
-DTEND:20240803T103400Z
+UID:20240803T095500Z-athletics-MENS-100M-ROUND-1
+DTSTAMP:20240803T095500Z
+DTSTART:20240803T095500Z
+DTEND:20240803T104400Z
 DESCRIPTION:Athletics - Men's 100m Round 1
 SUMMARY:🏃 Men's 100m Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240803T100000Z-athletics-MENS-DECATHLON-DISCUS-THROW-GROUP-B
-DTSTAMP:20240803T100000Z
-DTSTART:20240803T100000Z
-DTEND:20240803T103600Z
+UID:20240803T100500Z-athletics-MENS-DECATHLON-DISCUS-THROW-GROUP-B
+DTSTAMP:20240803T100500Z
+DTSTART:20240803T100500Z
+DTEND:20240803T104100Z
 DESCRIPTION:Athletics - Men's Decathlon Discus Throw - Group B
 SUMMARY:🏃 Men's Decathlon Discus Throw - Group B
 LOCATION:Stade de France
@@ -418,19 +418,19 @@ SUMMARY:🏃 Men's 400m Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240804T175000Z-athletics-WOMENS-HIGH-JUMP-FINAL
-DTSTAMP:20240804T175000Z
-DTSTART:20240804T175000Z
-DTEND:20240804T193500Z
+UID:20240804T175500Z-athletics-WOMENS-HIGH-JUMP-FINAL
+DTSTAMP:20240804T175500Z
+DTSTART:20240804T175500Z
+DTEND:20240804T194000Z
 DESCRIPTION:Athletics - Women's High Jump Final
 SUMMARY:🏃 Women's High Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240804T180000Z-athletics-MENS-100M-SEMI-FINAL
-DTSTAMP:20240804T180000Z
-DTSTART:20240804T180000Z
-DTEND:20240804T181700Z
+UID:20240804T180500Z-athletics-MENS-100M-SEMI-FINAL
+DTSTAMP:20240804T180500Z
+DTSTART:20240804T180500Z
+DTEND:20240804T182200Z
 DESCRIPTION:Athletics - Men's 100m Semi-Final
 SUMMARY:🏃 Men's 100m Semi-Final
 LOCATION:Stade de France
@@ -589,19 +589,19 @@ SUMMARY:🏃 Women's 200m Semi-Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T191000Z-athletics-WOMENS-5000M-FINAL
-DTSTAMP:20240805T191000Z
-DTSTART:20240805T191000Z
-DTEND:20240805T192700Z
+UID:20240805T191500Z-athletics-WOMENS-5000M-FINAL
+DTSTAMP:20240805T191500Z
+DTSTART:20240805T191500Z
+DTEND:20240805T193200Z
 DESCRIPTION:Athletics - Women's 5000m Final
 SUMMARY:🏃 Women's 5000m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T194500Z-athletics-WOMENS-800M-FINAL
-DTSTAMP:20240805T194500Z
-DTSTART:20240805T194500Z
-DTEND:20240805T194700Z
+UID:20240805T194700Z-athletics-WOMENS-800M-FINAL
+DTSTAMP:20240805T194700Z
+DTSTART:20240805T194700Z
+DTEND:20240805T194900Z
 DESCRIPTION:Athletics - Women's 800m Final
 SUMMARY:🏃 Women's 800m Final
 LOCATION:Stade de France
@@ -688,10 +688,10 @@ SUMMARY:🏃 Men's 400m Semi-Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T175500Z-athletics-WOMENS-HAMMER-THROW-FINAL
-DTSTAMP:20240806T175500Z
-DTSTART:20240806T175500Z
-DTEND:20240806T190500Z
+UID:20240806T175700Z-athletics-WOMENS-HAMMER-THROW-FINAL
+DTSTAMP:20240806T175700Z
+DTSTART:20240806T175700Z
+DTEND:20240806T190700Z
 DESCRIPTION:Athletics - Women's Hammer Throw Final
 SUMMARY:🏃 Women's Hammer Throw Final
 LOCATION:Stade de France
@@ -724,10 +724,10 @@ SUMMARY:🏃 Men's 1500m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T191000Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240806T191000Z
-DTSTART:20240806T191000Z
-DTEND:20240806T192000Z
+UID:20240806T191400Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240806T191400Z
+DTSTART:20240806T191400Z
+DTEND:20240806T192400Z
 DESCRIPTION:Athletics - Women's 3000m Steeplechase Final
 SUMMARY:🏃 Women's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -886,10 +886,10 @@ SUMMARY:🏃 Men's 400m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T194000Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240807T194000Z
-DTSTART:20240807T194000Z
-DTEND:20240807T194900Z
+UID:20240807T194300Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240807T194300Z
+DTSTART:20240807T194300Z
+DTEND:20240807T195200Z
 DESCRIPTION:Athletics - Men's 3000m Steeplechase Final
 SUMMARY:🏃 Men's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -1057,10 +1057,10 @@ SUMMARY:🏃 Men's 4 x 400m Relay Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T092000Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-A
-DTSTAMP:20240809T092000Z
-DTSTART:20240809T092000Z
-DTEND:20240809T100200Z
+UID:20240809T092300Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-A
+DTSTAMP:20240809T092300Z
+DTSTART:20240809T092300Z
+DTEND:20240809T100500Z
 DESCRIPTION:Athletics - Women's Heptathlon Javelin Throw - Group A
 SUMMARY:🏃 Women's Heptathlon Javelin Throw - Group A
 LOCATION:Stade de France
@@ -1084,10 +1084,10 @@ SUMMARY:🏃 Women's 100m Hurdles Semi-Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T103000Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-B
-DTSTAMP:20240809T103000Z
-DTSTART:20240809T103000Z
-DTEND:20240809T111200Z
+UID:20240809T103200Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-B
+DTSTAMP:20240809T103200Z
+DTSTART:20240809T103200Z
+DTEND:20240809T111400Z
 DESCRIPTION:Athletics - Women's Heptathlon Javelin Throw - Group B
 SUMMARY:🏃 Women's Heptathlon Javelin Throw - Group B
 LOCATION:Stade de France
@@ -1102,19 +1102,19 @@ SUMMARY:🏃 Women's 4 x 100m Relay Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174000Z-athletics-WOMENS-SHOT-PUT-FINAL
-DTSTAMP:20240809T174000Z
-DTSTART:20240809T174000Z
-DTEND:20240809T185000Z
+UID:20240809T173700Z-athletics-WOMENS-SHOT-PUT-FINAL
+DTSTAMP:20240809T173700Z
+DTSTART:20240809T173700Z
+DTEND:20240809T184700Z
 DESCRIPTION:Athletics - Women's Shot Put Final
 SUMMARY:🏃 Women's Shot Put Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174500Z-athletics-MENS-4-X-100M-RELAY-FINAL
-DTSTAMP:20240809T174500Z
-DTSTART:20240809T174500Z
-DTEND:20240809T174600Z
+UID:20240809T174700Z-athletics-MENS-4-X-100M-RELAY-FINAL
+DTSTAMP:20240809T174700Z
+DTSTART:20240809T174700Z
+DTEND:20240809T174800Z
 DESCRIPTION:Athletics - Men's 4 x 100m Relay Final
 SUMMARY:🏃 Men's 4 x 100m Relay Final
 LOCATION:Stade de France
@@ -1129,28 +1129,28 @@ SUMMARY:🏃 Women's 400m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181000Z-athletics-MENS-TRIPLE-JUMP-FINAL
-DTSTAMP:20240809T181000Z
-DTSTART:20240809T181000Z
-DTEND:20240809T193500Z
+UID:20240809T181300Z-athletics-MENS-TRIPLE-JUMP-FINAL
+DTSTAMP:20240809T181300Z
+DTSTART:20240809T181300Z
+DTEND:20240809T193800Z
 DESCRIPTION:Athletics - Men's Triple Jump Final
 SUMMARY:🏃 Men's Triple Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181500Z-athletics-WOMENS-HEPTATHLON-800M
-DTSTAMP:20240809T181500Z
-DTSTART:20240809T181500Z
-DTEND:20240809T183800Z
+UID:20240809T182500Z-athletics-WOMENS-HEPTATHLON-800M
+DTSTAMP:20240809T182500Z
+DTSTART:20240809T182500Z
+DTEND:20240809T184800Z
 DESCRIPTION:Athletics - Women's Heptathlon 800m
 SUMMARY:🏃 Women's Heptathlon 800m
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T185500Z-athletics-WOMENS-10000M-FINAL
-DTSTAMP:20240809T185500Z
-DTSTART:20240809T185500Z
-DTEND:20240809T192900Z
+UID:20240809T185700Z-athletics-WOMENS-10000M-FINAL
+DTSTAMP:20240809T185700Z
+DTSTART:20240809T185700Z
+DTEND:20240809T193100Z
 DESCRIPTION:Athletics - Women's 10,000m Final
 SUMMARY:🏃 Women's 10,000m Final
 LOCATION:Stade de France
@@ -1174,73 +1174,73 @@ SUMMARY:🏃 Men's Marathon
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T171000Z-athletics-MENS-HIGH-JUMP-FINAL
-DTSTAMP:20240810T171000Z
-DTSTART:20240810T171000Z
-DTEND:20240810T190300Z
+UID:20240810T170000Z-athletics-MENS-HIGH-JUMP-FINAL
+DTSTAMP:20240810T170000Z
+DTSTART:20240810T170000Z
+DTEND:20240810T185300Z
 DESCRIPTION:Athletics - Men's High Jump Final
 SUMMARY:🏃 Men's High Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T172500Z-athletics-MENS-800M-FINAL
-DTSTAMP:20240810T172500Z
-DTSTART:20240810T172500Z
-DTEND:20240810T172700Z
+UID:20240810T170500Z-athletics-MENS-800M-FINAL
+DTSTAMP:20240810T170500Z
+DTSTART:20240810T170500Z
+DTEND:20240810T170700Z
 DESCRIPTION:Athletics - Men's 800m Final
 SUMMARY:🏃 Men's 800m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
-DTSTAMP:20240810T174000Z
-DTSTART:20240810T174000Z
-DTEND:20240810T185800Z
+UID:20240810T173000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
+DTSTAMP:20240810T173000Z
+DTSTART:20240810T173000Z
+DTEND:20240810T184800Z
 DESCRIPTION:Athletics - Women's Javelin Throw Final
 SUMMARY:🏃 Women's Javelin Throw Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174500Z-athletics-WOMENS-100M-HURDLES-FINAL
-DTSTAMP:20240810T174500Z
-DTSTART:20240810T174500Z
-DTEND:20240810T174600Z
+UID:20240810T173500Z-athletics-WOMENS-100M-HURDLES-FINAL
+DTSTAMP:20240810T173500Z
+DTSTART:20240810T173500Z
+DTEND:20240810T173600Z
 DESCRIPTION:Athletics - Women's 100m Hurdles Final
 SUMMARY:🏃 Women's 100m Hurdles Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T180000Z-athletics-MENS-5000M-FINAL
-DTSTAMP:20240810T180000Z
-DTSTART:20240810T180000Z
-DTEND:20240810T181500Z
+UID:20240810T175000Z-athletics-MENS-5000M-FINAL
+DTSTAMP:20240810T175000Z
+DTSTART:20240810T175000Z
+DTEND:20240810T180500Z
 DESCRIPTION:Athletics - Men's 5000m Final
 SUMMARY:🏃 Men's 5000m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T182500Z-athletics-WOMENS-1500M-FINAL
-DTSTAMP:20240810T182500Z
-DTSTART:20240810T182500Z
-DTEND:20240810T182900Z
+UID:20240810T181500Z-athletics-WOMENS-1500M-FINAL
+DTSTAMP:20240810T181500Z
+DTSTART:20240810T181500Z
+DTEND:20240810T181900Z
 DESCRIPTION:Athletics - Women's 1500m Final
 SUMMARY:🏃 Women's 1500m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T191200Z-athletics-MENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T191200Z
-DTSTART:20240810T191200Z
-DTEND:20240810T191500Z
+UID:20240810T190000Z-athletics-MENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T190000Z
+DTSTART:20240810T190000Z
+DTEND:20240810T190300Z
 DESCRIPTION:Athletics - Men's 4 x 400m Relay Final
 SUMMARY:🏃 Men's 4 x 400m Relay Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T192200Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T192200Z
-DTSTART:20240810T192200Z
-DTEND:20240810T192600Z
+UID:20240810T191400Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T191400Z
+DTSTART:20240810T191400Z
+DTEND:20240810T191800Z
 DESCRIPTION:Athletics - Women's 4 x 400m Relay Final
 SUMMARY:🏃 Women's 4 x 400m Relay Final
 LOCATION:Stade de France
diff --git a/docs/athletics/medals.ics b/docs/athletics/medals.ics
index 61cd92f1e..a612bdfd1 100644
--- a/docs/athletics/medals.ics
+++ b/docs/athletics/medals.ics
@@ -76,10 +76,10 @@ SUMMARY:🏃 Men's Decathlon 1500m
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240804T175000Z-athletics-WOMENS-HIGH-JUMP-FINAL
-DTSTAMP:20240804T175000Z
-DTSTART:20240804T175000Z
-DTEND:20240804T193500Z
+UID:20240804T175500Z-athletics-WOMENS-HIGH-JUMP-FINAL
+DTSTAMP:20240804T175500Z
+DTSTART:20240804T175500Z
+DTEND:20240804T194000Z
 DESCRIPTION:Athletics - Women's High Jump Final
 SUMMARY:🏃 Women's High Jump Final
 LOCATION:Stade de France
@@ -121,28 +121,28 @@ SUMMARY:🏃 Women's Discus Throw Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T191000Z-athletics-WOMENS-5000M-FINAL
-DTSTAMP:20240805T191000Z
-DTSTART:20240805T191000Z
-DTEND:20240805T192700Z
+UID:20240805T191500Z-athletics-WOMENS-5000M-FINAL
+DTSTAMP:20240805T191500Z
+DTSTART:20240805T191500Z
+DTEND:20240805T193200Z
 DESCRIPTION:Athletics - Women's 5000m Final
 SUMMARY:🏃 Women's 5000m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T194500Z-athletics-WOMENS-800M-FINAL
-DTSTAMP:20240805T194500Z
-DTSTART:20240805T194500Z
-DTEND:20240805T194700Z
+UID:20240805T194700Z-athletics-WOMENS-800M-FINAL
+DTSTAMP:20240805T194700Z
+DTSTART:20240805T194700Z
+DTEND:20240805T194900Z
 DESCRIPTION:Athletics - Women's 800m Final
 SUMMARY:🏃 Women's 800m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T175500Z-athletics-WOMENS-HAMMER-THROW-FINAL
-DTSTAMP:20240806T175500Z
-DTSTART:20240806T175500Z
-DTEND:20240806T190500Z
+UID:20240806T175700Z-athletics-WOMENS-HAMMER-THROW-FINAL
+DTSTAMP:20240806T175700Z
+DTSTART:20240806T175700Z
+DTEND:20240806T190700Z
 DESCRIPTION:Athletics - Women's Hammer Throw Final
 SUMMARY:🏃 Women's Hammer Throw Final
 LOCATION:Stade de France
@@ -166,10 +166,10 @@ SUMMARY:🏃 Men's 1500m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T191000Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240806T191000Z
-DTSTART:20240806T191000Z
-DTEND:20240806T192000Z
+UID:20240806T191400Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240806T191400Z
+DTSTART:20240806T191400Z
+DTEND:20240806T192400Z
 DESCRIPTION:Athletics - Women's 3000m Steeplechase Final
 SUMMARY:🏃 Women's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -220,10 +220,10 @@ SUMMARY:🏃 Men's 400m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T194000Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240807T194000Z
-DTSTART:20240807T194000Z
-DTEND:20240807T194900Z
+UID:20240807T194300Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240807T194300Z
+DTSTART:20240807T194300Z
+DTEND:20240807T195200Z
 DESCRIPTION:Athletics - Men's 3000m Steeplechase Final
 SUMMARY:🏃 Men's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -283,19 +283,19 @@ SUMMARY:🏃 Women's 4 x 100m Relay Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174000Z-athletics-WOMENS-SHOT-PUT-FINAL
-DTSTAMP:20240809T174000Z
-DTSTART:20240809T174000Z
-DTEND:20240809T185000Z
+UID:20240809T173700Z-athletics-WOMENS-SHOT-PUT-FINAL
+DTSTAMP:20240809T173700Z
+DTSTART:20240809T173700Z
+DTEND:20240809T184700Z
 DESCRIPTION:Athletics - Women's Shot Put Final
 SUMMARY:🏃 Women's Shot Put Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174500Z-athletics-MENS-4-X-100M-RELAY-FINAL
-DTSTAMP:20240809T174500Z
-DTSTART:20240809T174500Z
-DTEND:20240809T174600Z
+UID:20240809T174700Z-athletics-MENS-4-X-100M-RELAY-FINAL
+DTSTAMP:20240809T174700Z
+DTSTART:20240809T174700Z
+DTEND:20240809T174800Z
 DESCRIPTION:Athletics - Men's 4 x 100m Relay Final
 SUMMARY:🏃 Men's 4 x 100m Relay Final
 LOCATION:Stade de France
@@ -310,28 +310,28 @@ SUMMARY:🏃 Women's 400m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181000Z-athletics-MENS-TRIPLE-JUMP-FINAL
-DTSTAMP:20240809T181000Z
-DTSTART:20240809T181000Z
-DTEND:20240809T193500Z
+UID:20240809T181300Z-athletics-MENS-TRIPLE-JUMP-FINAL
+DTSTAMP:20240809T181300Z
+DTSTART:20240809T181300Z
+DTEND:20240809T193800Z
 DESCRIPTION:Athletics - Men's Triple Jump Final
 SUMMARY:🏃 Men's Triple Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181500Z-athletics-WOMENS-HEPTATHLON-800M
-DTSTAMP:20240809T181500Z
-DTSTART:20240809T181500Z
-DTEND:20240809T183800Z
+UID:20240809T182500Z-athletics-WOMENS-HEPTATHLON-800M
+DTSTAMP:20240809T182500Z
+DTSTART:20240809T182500Z
+DTEND:20240809T184800Z
 DESCRIPTION:Athletics - Women's Heptathlon 800m
 SUMMARY:🏃 Women's Heptathlon 800m
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T185500Z-athletics-WOMENS-10000M-FINAL
-DTSTAMP:20240809T185500Z
-DTSTART:20240809T185500Z
-DTEND:20240809T192900Z
+UID:20240809T185700Z-athletics-WOMENS-10000M-FINAL
+DTSTAMP:20240809T185700Z
+DTSTART:20240809T185700Z
+DTEND:20240809T193100Z
 DESCRIPTION:Athletics - Women's 10,000m Final
 SUMMARY:🏃 Women's 10,000m Final
 LOCATION:Stade de France
@@ -355,73 +355,73 @@ SUMMARY:🏃 Men's Marathon
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T171000Z-athletics-MENS-HIGH-JUMP-FINAL
-DTSTAMP:20240810T171000Z
-DTSTART:20240810T171000Z
-DTEND:20240810T190300Z
+UID:20240810T170000Z-athletics-MENS-HIGH-JUMP-FINAL
+DTSTAMP:20240810T170000Z
+DTSTART:20240810T170000Z
+DTEND:20240810T185300Z
 DESCRIPTION:Athletics - Men's High Jump Final
 SUMMARY:🏃 Men's High Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T172500Z-athletics-MENS-800M-FINAL
-DTSTAMP:20240810T172500Z
-DTSTART:20240810T172500Z
-DTEND:20240810T172700Z
+UID:20240810T170500Z-athletics-MENS-800M-FINAL
+DTSTAMP:20240810T170500Z
+DTSTART:20240810T170500Z
+DTEND:20240810T170700Z
 DESCRIPTION:Athletics - Men's 800m Final
 SUMMARY:🏃 Men's 800m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
-DTSTAMP:20240810T174000Z
-DTSTART:20240810T174000Z
-DTEND:20240810T185800Z
+UID:20240810T173000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
+DTSTAMP:20240810T173000Z
+DTSTART:20240810T173000Z
+DTEND:20240810T184800Z
 DESCRIPTION:Athletics - Women's Javelin Throw Final
 SUMMARY:🏃 Women's Javelin Throw Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174500Z-athletics-WOMENS-100M-HURDLES-FINAL
-DTSTAMP:20240810T174500Z
-DTSTART:20240810T174500Z
-DTEND:20240810T174600Z
+UID:20240810T173500Z-athletics-WOMENS-100M-HURDLES-FINAL
+DTSTAMP:20240810T173500Z
+DTSTART:20240810T173500Z
+DTEND:20240810T173600Z
 DESCRIPTION:Athletics - Women's 100m Hurdles Final
 SUMMARY:🏃 Women's 100m Hurdles Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T180000Z-athletics-MENS-5000M-FINAL
-DTSTAMP:20240810T180000Z
-DTSTART:20240810T180000Z
-DTEND:20240810T181500Z
+UID:20240810T175000Z-athletics-MENS-5000M-FINAL
+DTSTAMP:20240810T175000Z
+DTSTART:20240810T175000Z
+DTEND:20240810T180500Z
 DESCRIPTION:Athletics - Men's 5000m Final
 SUMMARY:🏃 Men's 5000m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T182500Z-athletics-WOMENS-1500M-FINAL
-DTSTAMP:20240810T182500Z
-DTSTART:20240810T182500Z
-DTEND:20240810T182900Z
+UID:20240810T181500Z-athletics-WOMENS-1500M-FINAL
+DTSTAMP:20240810T181500Z
+DTSTART:20240810T181500Z
+DTEND:20240810T181900Z
 DESCRIPTION:Athletics - Women's 1500m Final
 SUMMARY:🏃 Women's 1500m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T191200Z-athletics-MENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T191200Z
-DTSTART:20240810T191200Z
-DTEND:20240810T191500Z
+UID:20240810T190000Z-athletics-MENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T190000Z
+DTSTART:20240810T190000Z
+DTEND:20240810T190300Z
 DESCRIPTION:Athletics - Men's 4 x 400m Relay Final
 SUMMARY:🏃 Men's 4 x 400m Relay Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T192200Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T192200Z
-DTSTART:20240810T192200Z
-DTEND:20240810T192600Z
+UID:20240810T191400Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T191400Z
+DTSTART:20240810T191400Z
+DTEND:20240810T191800Z
 DESCRIPTION:Athletics - Women's 4 x 400m Relay Final
 SUMMARY:🏃 Women's 4 x 400m Relay Final
 LOCATION:Stade de France
diff --git a/docs/fencing/HKG.ics b/docs/fencing/HKG.ics
index e64031e2e..a2cd400e7 100644
--- a/docs/fencing/HKG.ics
+++ b/docs/fencing/HKG.ics
@@ -112,13 +112,12 @@ SUMMARY:🤺 CHEUNG Ka Long 🇭🇰 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
 DTSTAMP:20240729T201000Z
 DTSTART:20240729T201000Z
 DTEND:20240729T204000Z
-DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout\n🇭🇰 CHEUNG Ka
-  Long
-SUMMARY:🤺 Men's Foil Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
 LOCATION:Grand Palais
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/fencing/ITA.ics b/docs/fencing/ITA.ics
index 933420aa0..037bd0a86 100644
--- a/docs/fencing/ITA.ics
+++ b/docs/fencing/ITA.ics
@@ -382,6 +382,15 @@ SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇺🇸 Nick ITKIN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
+DTSTAMP:20240729T201000Z
+DTSTART:20240729T201000Z
+DTEND:20240729T204000Z
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T113000Z-fencing-WOMENS-PE-TEAM-TABLE-OF-8-ITA-EGY
 DTSTAMP:20240730T113000Z
 DTSTART:20240730T113000Z
diff --git a/docs/fencing/JPN.ics b/docs/fencing/JPN.ics
index cbe073fdd..aa79bfc0f 100644
--- a/docs/fencing/JPN.ics
+++ b/docs/fencing/JPN.ics
@@ -256,13 +256,12 @@ SUMMARY:🤺 CHEUNG Ka Long 🇭🇰 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
 DTSTAMP:20240729T191500Z
 DTSTART:20240729T191500Z
 DTEND:20240729T194500Z
-DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout\n🇯🇵 IIMURA
-  Kazuki
-SUMMARY:🤺 Men's Foil Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/USA.ics b/docs/fencing/USA.ics
index 075cf03ca..43fec04da 100644
--- a/docs/fencing/USA.ics
+++ b/docs/fencing/USA.ics
@@ -274,6 +274,15 @@ SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇺🇸 Nick ITKIN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
+DTSTAMP:20240729T191500Z
+DTSTART:20240729T191500Z
+DTEND:20240729T194500Z
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T113000Z-fencing-WOMENS-PE-TEAM-TABLE-OF-8-POL-USA
 DTSTAMP:20240730T113000Z
 DTSTART:20240730T113000Z
diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 5303e0c09..f95c469b3 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -1885,13 +1885,12 @@ SUMMARY:🤺 CHOI Sebin 🇰🇷 - 🇺🇦 Olga KHARLAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
 DTSTAMP:20240729T191500Z
 DTSTART:20240729T191500Z
 DTEND:20240729T194500Z
-DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout\n🇯🇵 IIMURA
-  Kazuki
-SUMMARY:🤺 Men's Foil Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -1904,13 +1903,12 @@ SUMMARY:🤺 Sara BALZER 🇫🇷 - 🇫🇷 Manon APITHY-BRUNET
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
 DTSTAMP:20240729T201000Z
 DTSTART:20240729T201000Z
 DTEND:20240729T204000Z
-DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout\n🇭🇰 CHEUNG Ka
-  Long
-SUMMARY:🤺 Men's Foil Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/medals.ics b/docs/fencing/medals.ics
index d221cd28e..2d9851a1a 100644
--- a/docs/fencing/medals.ics
+++ b/docs/fencing/medals.ics
@@ -85,13 +85,12 @@ SUMMARY:🤺 CHOI Sebin 🇰🇷 - 🇺🇦 Olga KHARLAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
 DTSTAMP:20240729T191500Z
 DTSTART:20240729T191500Z
 DTEND:20240729T194500Z
-DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout\n🇯🇵 IIMURA
-  Kazuki
-SUMMARY:🤺 Men's Foil Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -104,13 +103,12 @@ SUMMARY:🤺 Sara BALZER 🇫🇷 - 🇫🇷 Manon APITHY-BRUNET
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
 DTSTAMP:20240729T201000Z
 DTSTART:20240729T201000Z
 DTEND:20240729T204000Z
-DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout\n🇭🇰 CHEUNG Ka
-  Long
-SUMMARY:🤺 Men's Foil Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 3ca698f82..e4b140b05 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -2170,12 +2170,12 @@ SUMMARY:🏓 Felix LEBRUN 🇫🇷 - 🇸🇪 Anton KALLBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-USA-FRA
+UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-FRA-USA
 DTSTAMP:20240729T181200Z
 DTSTART:20240729T181200Z
 DTEND:20240729T184200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 3
-SUMMARY:🏄 Griffin COLAPINTO 🇺🇸 - 🇫🇷 Kauli VAAST
+SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇺🇸 Griffin COLAPINTO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/HKG.ics b/docs/general/HKG.ics
index 94110b01c..732f04f9b 100644
--- a/docs/general/HKG.ics
+++ b/docs/general/HKG.ics
@@ -381,13 +381,12 @@ SUMMARY:🏊 Women's 200m Freestyle Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
 DTSTAMP:20240729T201000Z
 DTSTART:20240729T201000Z
 DTEND:20240729T204000Z
-DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout\n🇭🇰 CHEUNG Ka
-  Long
-SUMMARY:🤺 Men's Foil Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ITA.ics b/docs/general/ITA.ics
index 01f1ce58d..8ca7e8074 100644
--- a/docs/general/ITA.ics
+++ b/docs/general/ITA.ics
@@ -1640,6 +1640,15 @@ SUMMARY:🏊 Women's 100m Breaststroke Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
+DTSTAMP:20240729T201000Z
+DTSTART:20240729T201000Z
+DTEND:20240729T204000Z
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 9802537da..9df7a372f 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1597,13 +1597,12 @@ SUMMARY:🏀 USA 🇺🇸 - 🇯🇵 JPN
 LOCATION:Pierre Mauroy Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
 DTSTAMP:20240729T191500Z
 DTSTART:20240729T191500Z
 DTEND:20240729T194500Z
-DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout\n🇯🇵 IIMURA
-  Kazuki
-SUMMARY:🤺 Men's Foil Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 46280a7cb..0b923936c 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -1769,12 +1769,12 @@ SUMMARY:🏸 HOKI/KOBAYASHI 🇯🇵 - 🇺🇸 CHIU/YUAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-USA-FRA
+UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-FRA-USA
 DTSTAMP:20240729T181200Z
 DTSTART:20240729T181200Z
 DTEND:20240729T184200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 3
-SUMMARY:🏄 Griffin COLAPINTO 🇺🇸 - 🇫🇷 Kauli VAAST
+SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇺🇸 Griffin COLAPINTO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -1838,6 +1838,15 @@ SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
+DTSTAMP:20240729T191500Z
+DTSTART:20240729T191500Z
+DTEND:20240729T194500Z
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T192700Z-swimming-MENS-100M-BACKSTROKE-FINAL
 DTSTAMP:20240729T192700Z
 DTSTART:20240729T192700Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index af835bcef..e5567baf8 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -10594,12 +10594,12 @@ SUMMARY:🤽 HUN 🇭🇺 - 🇨🇦 CAN
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-USA-FRA
+UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-FRA-USA
 DTSTAMP:20240729T181200Z
 DTSTART:20240729T181200Z
 DTEND:20240729T184200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 3
-SUMMARY:🏄 Griffin COLAPINTO 🇺🇸 - 🇫🇷 Kauli VAAST
+SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇺🇸 Griffin COLAPINTO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -10852,13 +10852,12 @@ SUMMARY:🏸 Thuy Linh NGUYEN 🇻🇳 - 🇦🇺 Tiffany HO
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
 DTSTAMP:20240729T191500Z
 DTSTART:20240729T191500Z
 DTEND:20240729T194500Z
-DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout\n🇯🇵 IIMURA
-  Kazuki
-SUMMARY:🤺 Men's Foil Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -11023,13 +11022,12 @@ SUMMARY:🏓 Adriana DIAZ 🇵🇷 - 🇺🇸 Amy WANG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
 DTSTAMP:20240729T201000Z
 DTSTART:20240729T201000Z
 DTEND:20240729T204000Z
-DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout\n🇭🇰 CHEUNG Ka
-  Long
-SUMMARY:🤺 Men's Foil Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -20370,15 +20368,6 @@ SUMMARY:🏹 JPN 🇯🇵 - 🇹🇷 TUR
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240802T090500Z-athletics-MENS-1500M-ROUND-1
-DTSTAMP:20240802T090500Z
-DTSTART:20240802T090500Z
-DTEND:20240802T093100Z
-DESCRIPTION:Athletics - Men's 1500m Round 1
-SUMMARY:🏃 Men's 1500m Round 1
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240802T090600Z-judo-MEN-100-KG-ELIMINATION-ROUND-OF-16
 DTSTAMP:20240802T090600Z
 DTSTART:20240802T090600Z
@@ -20406,6 +20395,15 @@ SUMMARY:🚣 Lightweight Men's Double Sculls Final B
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240802T091000Z-athletics-MENS-1500M-ROUND-1
+DTSTAMP:20240802T091000Z
+DTSTART:20240802T091000Z
+DTEND:20240802T093600Z
+DESCRIPTION:Athletics - Men's 1500m Round 1
+SUMMARY:🏃 Men's 1500m Round 1
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240802T091200Z-judo-MEN-100-KG-ELIMINATION-ROUND-OF-16
 DTSTAMP:20240802T091200Z
 DTSTART:20240802T091200Z
@@ -22518,15 +22516,6 @@ SUMMARY:🏹 Women's Individual 1/8 Elimination Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240803T091000Z-athletics-WOMENS-800M-REPECHAGE-ROUND
-DTSTAMP:20240803T091000Z
-DTSTART:20240803T091000Z
-DTEND:20240803T093600Z
-DESCRIPTION:Athletics - Women's 800m Repechage Round
-SUMMARY:🏃 Women's 800m Repechage Round
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240803T091000Z-rowing-MENS-EIGHT-FINAL-A
 DTSTAMP:20240803T091000Z
 DTSTART:20240803T091000Z
@@ -22536,6 +22525,15 @@ SUMMARY:🚣 Men's Eight Final A
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240803T092000Z-athletics-WOMENS-800M-REPECHAGE-ROUND
+DTSTAMP:20240803T092000Z
+DTSTART:20240803T092000Z
+DTEND:20240803T094600Z
+DESCRIPTION:Athletics - Women's 800m Repechage Round
+SUMMARY:🏃 Women's 800m Repechage Round
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240803T092500Z-swimming-MENS-1500M-FREESTYLE-HEATS
 DTSTAMP:20240803T092500Z
 DTSTART:20240803T092500Z
@@ -22563,24 +22561,15 @@ SUMMARY:🥋 Mixed Team Quarterfinal
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240803T094500Z-athletics-MENS-100M-ROUND-1
-DTSTAMP:20240803T094500Z
-DTSTART:20240803T094500Z
-DTEND:20240803T103400Z
+UID:20240803T095500Z-athletics-MENS-100M-ROUND-1
+DTSTAMP:20240803T095500Z
+DTSTART:20240803T095500Z
+DTEND:20240803T104400Z
 DESCRIPTION:Athletics - Men's 100m Round 1
 SUMMARY:🏃 Men's 100m Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240803T100000Z-athletics-MENS-DECATHLON-DISCUS-THROW-GROUP-B
-DTSTAMP:20240803T100000Z
-DTSTART:20240803T100000Z
-DTEND:20240803T103600Z
-DESCRIPTION:Athletics - Men's Decathlon Discus Throw - Group B
-SUMMARY:🏃 Men's Decathlon Discus Throw - Group B
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240803T100000Z-beach-volleyball-WOMENS-PRELIMINARY-PHASE-POOL-F-ESP-G
 DTSTAMP:20240803T100000Z
 DTSTART:20240803T100000Z
@@ -22626,6 +22615,15 @@ SUMMARY:🎾 Women's Singles Gold Medal Match
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240803T100500Z-athletics-MENS-DECATHLON-DISCUS-THROW-GROUP-B
+DTSTAMP:20240803T100500Z
+DTSTART:20240803T100500Z
+DTEND:20240803T104100Z
+DESCRIPTION:Athletics - Men's Decathlon Discus Throw - Group B
+SUMMARY:🏃 Men's Decathlon Discus Throw - Group B
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240803T100500Z-water-polo-MENS-PRELIMINARY-ROUND-GROUP-A-CRO-GRE
 DTSTAMP:20240803T100500Z
 DTSTART:20240803T100500Z
@@ -24832,24 +24830,15 @@ SUMMARY:🏊 Women's 4 x 100m Medley Relay Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240804T175000Z-athletics-WOMENS-HIGH-JUMP-FINAL
-DTSTAMP:20240804T175000Z
-DTSTART:20240804T175000Z
-DTEND:20240804T193500Z
+UID:20240804T175500Z-athletics-WOMENS-HIGH-JUMP-FINAL
+DTSTAMP:20240804T175500Z
+DTSTART:20240804T175500Z
+DTEND:20240804T194000Z
 DESCRIPTION:Athletics - Women's High Jump Final
 SUMMARY:🏃 Women's High Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240804T180000Z-athletics-MENS-100M-SEMI-FINAL
-DTSTAMP:20240804T180000Z
-DTSTART:20240804T180000Z
-DTEND:20240804T181700Z
-DESCRIPTION:Athletics - Men's 100m Semi-Final
-SUMMARY:🏃 Men's 100m Semi-Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240804T180000Z-hockey-MENS-QUARTER-FINAL
 DTSTAMP:20240804T180000Z
 DTSTART:20240804T180000Z
@@ -24859,6 +24848,15 @@ SUMMARY:🏑 Men's Quarter-final
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240804T180500Z-athletics-MENS-100M-SEMI-FINAL
+DTSTAMP:20240804T180500Z
+DTSTART:20240804T180500Z
+DTEND:20240804T182200Z
+DESCRIPTION:Athletics - Men's 100m Semi-Final
+SUMMARY:🏃 Men's 100m Semi-Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240804T180500Z-water-polo-WOMENS-PRELIMINARY-ROUND-GROUP-B-FRA-GRE
 DTSTAMP:20240804T180500Z
 DTSTART:20240804T180500Z
@@ -25994,15 +25992,6 @@ SUMMARY:🤼 Men's Greco-Roman 60kg Semifinal
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T191000Z-athletics-WOMENS-5000M-FINAL
-DTSTAMP:20240805T191000Z
-DTSTART:20240805T191000Z
-DTEND:20240805T192700Z
-DESCRIPTION:Athletics - Women's 5000m Final
-SUMMARY:🏃 Women's 5000m Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240805T191000Z-wrestling-MENS-GRECO-ROMAN-60KG-SEMIFINAL
 DTSTAMP:20240805T191000Z
 DTSTART:20240805T191000Z
@@ -26012,6 +26001,15 @@ SUMMARY:🤼 Men's Greco-Roman 60kg Semifinal
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240805T191500Z-athletics-WOMENS-5000M-FINAL
+DTSTAMP:20240805T191500Z
+DTSTART:20240805T191500Z
+DTEND:20240805T193200Z
+DESCRIPTION:Athletics - Women's 5000m Final
+SUMMARY:🏃 Women's 5000m Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240805T192000Z-wrestling-MENS-GRECO-ROMAN-130KG-SEMIFINAL
 DTSTAMP:20240805T192000Z
 DTSTART:20240805T192000Z
@@ -26057,10 +26055,10 @@ SUMMARY:🤼 Women's Freestyle 68kg Semifinal
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T194500Z-athletics-WOMENS-800M-FINAL
-DTSTAMP:20240805T194500Z
-DTSTART:20240805T194500Z
-DTEND:20240805T194700Z
+UID:20240805T194700Z-athletics-WOMENS-800M-FINAL
+DTSTAMP:20240805T194700Z
+DTSTART:20240805T194700Z
+DTEND:20240805T194900Z
 DESCRIPTION:Athletics - Women's 800m Final
 SUMMARY:🏃 Women's 800m Final
 LOCATION:Stade de France
@@ -26884,15 +26882,6 @@ SUMMARY:🤼 Men's Greco-Roman 60kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T175500Z-athletics-WOMENS-HAMMER-THROW-FINAL
-DTSTAMP:20240806T175500Z
-DTSTART:20240806T175500Z
-DTEND:20240806T190500Z
-DESCRIPTION:Athletics - Women's Hammer Throw Final
-SUMMARY:🏃 Women's Hammer Throw Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T175500Z-cycling-track-MENS-TEAM-SPRINT-FINALS-FOR-PLACES-7-8
 DTSTAMP:20240806T175500Z
 DTSTART:20240806T175500Z
@@ -26911,6 +26900,15 @@ SUMMARY:🤼 Men's Greco-Roman 60kg Final
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T175700Z-athletics-WOMENS-HAMMER-THROW-FINAL
+DTSTAMP:20240806T175700Z
+DTSTART:20240806T175700Z
+DTEND:20240806T190700Z
+DESCRIPTION:Athletics - Women's Hammer Throw Final
+SUMMARY:🏃 Women's Hammer Throw Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T180000Z-cycling-track-MENS-TEAM-SPRINT-FINALS-FOR-PLACES-5-6
 DTSTAMP:20240806T180000Z
 DTSTART:20240806T180000Z
@@ -27055,10 +27053,10 @@ SUMMARY:🤼 Women's Freestyle 68kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T191000Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240806T191000Z
-DTSTART:20240806T191000Z
-DTEND:20240806T192000Z
+UID:20240806T191400Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240806T191400Z
+DTSTART:20240806T191400Z
+DTEND:20240806T192400Z
 DESCRIPTION:Athletics - Women's 3000m Steeplechase Final
 SUMMARY:🏃 Women's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -28531,10 +28529,10 @@ SUMMARY:🥋 Men -58kg Gold Medal Contest
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T194000Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240807T194000Z
-DTSTART:20240807T194000Z
-DTEND:20240807T194900Z
+UID:20240807T194300Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240807T194300Z
+DTSTART:20240807T194300Z
+DTEND:20240807T195200Z
 DESCRIPTION:Athletics - Men's 3000m Steeplechase Final
 SUMMARY:🏃 Men's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -30469,15 +30467,6 @@ SUMMARY:🤸 Group All-Around Qualification - Part 2 of 2
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T092000Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-A
-DTSTAMP:20240809T092000Z
-DTSTART:20240809T092000Z
-DTEND:20240809T100200Z
-DESCRIPTION:Athletics - Women's Heptathlon Javelin Throw - Group A
-SUMMARY:🏃 Women's Heptathlon Javelin Throw - Group A
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240809T092000Z-canoe-sprint-MENS-KAYAK-DOUBLE-500M-SEMIFINAL-2
 DTSTAMP:20240809T092000Z
 DTSTART:20240809T092000Z
@@ -30487,6 +30476,15 @@ SUMMARY:🛶 Men's Kayak Double 500m Semifinal 2
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240809T092300Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-A
+DTSTAMP:20240809T092300Z
+DTSTART:20240809T092300Z
+DTEND:20240809T100500Z
+DESCRIPTION:Athletics - Women's Heptathlon Javelin Throw - Group A
+SUMMARY:🏃 Women's Heptathlon Javelin Throw - Group A
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T092400Z-taekwondo-MEN-80KG-ROUND-OF-16
 DTSTAMP:20240809T092400Z
 DTSTART:20240809T092400Z
@@ -30604,10 +30602,10 @@ SUMMARY:🥋 Men -80kg Round of 16
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T103000Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-B
-DTSTAMP:20240809T103000Z
-DTSTART:20240809T103000Z
-DTEND:20240809T111200Z
+UID:20240809T103200Z-athletics-WOMENS-HEPTATHLON-JAVELIN-THROW-GROUP-B
+DTSTAMP:20240809T103200Z
+DTSTART:20240809T103200Z
+DTEND:20240809T111400Z
 DESCRIPTION:Athletics - Women's Heptathlon Javelin Throw - Group B
 SUMMARY:🏃 Women's Heptathlon Javelin Throw - Group B
 LOCATION:Stade de France
@@ -31240,6 +31238,15 @@ SUMMARY:🤽 Men's Semifinal
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240809T173700Z-athletics-WOMENS-SHOT-PUT-FINAL
+DTSTAMP:20240809T173700Z
+DTSTART:20240809T173700Z
+DTEND:20240809T184700Z
+DESCRIPTION:Athletics - Women's Shot Put Final
+SUMMARY:🏃 Women's Shot Put Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T173800Z-cycling-track-MENS-SPRINT-FINALS-DECIDER
 DTSTAMP:20240809T173800Z
 DTSTART:20240809T173800Z
@@ -31249,15 +31256,6 @@ SUMMARY:🚴 Men's Sprint, Finals - Decider
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174000Z-athletics-WOMENS-SHOT-PUT-FINAL
-DTSTAMP:20240809T174000Z
-DTSTART:20240809T174000Z
-DTEND:20240809T185000Z
-DESCRIPTION:Athletics - Women's Shot Put Final
-SUMMARY:🏃 Women's Shot Put Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240809T174000Z-taekwondo-MEN-80KG-REPECHAGE
 DTSTAMP:20240809T174000Z
 DTSTART:20240809T174000Z
@@ -31276,10 +31274,10 @@ SUMMARY:🤼 Men's Freestyle 57kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174500Z-athletics-MENS-4-X-100M-RELAY-FINAL
-DTSTAMP:20240809T174500Z
-DTSTART:20240809T174500Z
-DTEND:20240809T174600Z
+UID:20240809T174700Z-athletics-MENS-4-X-100M-RELAY-FINAL
+DTSTAMP:20240809T174700Z
+DTSTART:20240809T174700Z
+DTEND:20240809T174800Z
 DESCRIPTION:Athletics - Men's 4 x 100m Relay Final
 SUMMARY:🏃 Men's 4 x 100m Relay Final
 LOCATION:Stade de France
@@ -31366,10 +31364,10 @@ SUMMARY:🤸 B-Girls Quarterfinal 2
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181000Z-athletics-MENS-TRIPLE-JUMP-FINAL
-DTSTAMP:20240809T181000Z
-DTSTART:20240809T181000Z
-DTEND:20240809T193500Z
+UID:20240809T181300Z-athletics-MENS-TRIPLE-JUMP-FINAL
+DTSTAMP:20240809T181300Z
+DTSTART:20240809T181300Z
+DTEND:20240809T193800Z
 DESCRIPTION:Athletics - Men's Triple Jump Final
 SUMMARY:🏃 Men's Triple Jump Final
 LOCATION:Stade de France
@@ -31384,15 +31382,6 @@ SUMMARY:🤸 B-Girls Quarterfinal 3
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181500Z-athletics-WOMENS-HEPTATHLON-800M
-DTSTAMP:20240809T181500Z
-DTSTART:20240809T181500Z
-DTEND:20240809T183800Z
-DESCRIPTION:Athletics - Women's Heptathlon 800m
-SUMMARY:🏃 Women's Heptathlon 800m
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240809T181500Z-wrestling-MENS-FREESTYLE-86KG-BRONZE-MEDAL-MATCH
 DTSTAMP:20240809T181500Z
 DTSTART:20240809T181500Z
@@ -31420,6 +31409,15 @@ SUMMARY:🤸 B-Girls Quarterfinal 4
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240809T182500Z-athletics-WOMENS-HEPTATHLON-800M
+DTSTAMP:20240809T182500Z
+DTSTART:20240809T182500Z
+DTEND:20240809T184800Z
+DESCRIPTION:Athletics - Women's Heptathlon 800m
+SUMMARY:🏃 Women's Heptathlon 800m
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T183000Z-wrestling-MENS-FREESTYLE-86KG-FINAL
 DTSTAMP:20240809T183000Z
 DTSTART:20240809T183000Z
@@ -31474,10 +31472,10 @@ SUMMARY:🤸 B-Girls Semifinal 2
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T185500Z-athletics-WOMENS-10000M-FINAL
-DTSTAMP:20240809T185500Z
-DTSTART:20240809T185500Z
-DTEND:20240809T192900Z
+UID:20240809T185700Z-athletics-WOMENS-10000M-FINAL
+DTSTAMP:20240809T185700Z
+DTSTART:20240809T185700Z
+DTEND:20240809T193100Z
 DESCRIPTION:Athletics - Women's 10,000m Final
 SUMMARY:🏃 Women's 10,000m Final
 LOCATION:Stade de France
@@ -32491,6 +32489,24 @@ SUMMARY:🤼 Women's Freestyle 76kg Semifinal
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T170000Z-athletics-MENS-HIGH-JUMP-FINAL
+DTSTAMP:20240810T170000Z
+DTSTART:20240810T170000Z
+DTEND:20240810T185300Z
+DESCRIPTION:Athletics - Men's High Jump Final
+SUMMARY:🏃 Men's High Jump Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
+UID:20240810T170500Z-athletics-MENS-800M-FINAL
+DTSTAMP:20240810T170500Z
+DTSTART:20240810T170500Z
+DTEND:20240810T170700Z
+DESCRIPTION:Athletics - Men's 800m Final
+SUMMARY:🏃 Men's 800m Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T170500Z-wrestling-WOMENS-FREESTYLE-76KG-SEMIFINAL
 DTSTAMP:20240810T170500Z
 DTSTART:20240810T170500Z
@@ -32509,15 +32525,6 @@ SUMMARY:🚴 Women's Sprint, Quarterfinals - Race 1
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T171000Z-athletics-MENS-HIGH-JUMP-FINAL
-DTSTAMP:20240810T171000Z
-DTSTART:20240810T171000Z
-DTEND:20240810T190300Z
-DESCRIPTION:Athletics - Men's High Jump Final
-SUMMARY:🏃 Men's High Jump Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T171000Z-modern-pentathlon-MENS-INDIVIDUAL-FINAL-LASER-RUN
 DTSTAMP:20240810T171000Z
 DTSTART:20240810T171000Z
@@ -32536,15 +32543,6 @@ SUMMARY:🚴 Men's Keirin, Repechages
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T172500Z-athletics-MENS-800M-FINAL
-DTSTAMP:20240810T172500Z
-DTSTART:20240810T172500Z
-DTEND:20240810T172700Z
-DESCRIPTION:Athletics - Men's 800m Final
-SUMMARY:🏃 Men's 800m Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T173000Z-artistic-swimming-DUET-FREE-ROUTINE
 DTSTAMP:20240810T173000Z
 DTSTART:20240810T173000Z
@@ -32554,6 +32552,15 @@ SUMMARY:🏊 Duet Free Routine
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T173000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
+DTSTAMP:20240810T173000Z
+DTSTART:20240810T173000Z
+DTEND:20240810T184800Z
+DESCRIPTION:Athletics - Women's Javelin Throw Final
+SUMMARY:🏃 Women's Javelin Throw Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T173000Z-taekwondo-MEN-80KG-REPECHAGE
 DTSTAMP:20240810T173000Z
 DTSTART:20240810T173000Z
@@ -32572,6 +32579,15 @@ SUMMARY:🤼 Men's Freestyle 74kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T173500Z-athletics-WOMENS-100M-HURDLES-FINAL
+DTSTAMP:20240810T173500Z
+DTSTART:20240810T173500Z
+DTEND:20240810T173600Z
+DESCRIPTION:Athletics - Women's 100m Hurdles Final
+SUMMARY:🏃 Women's 100m Hurdles Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T173500Z-water-polo-MENS-CLASSIFICATION-7TH-8TH
 DTSTAMP:20240810T173500Z
 DTSTART:20240810T173500Z
@@ -32581,15 +32597,6 @@ SUMMARY:🤽 Men's Classification 7th-8th
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
-DTSTAMP:20240810T174000Z
-DTSTART:20240810T174000Z
-DTEND:20240810T185800Z
-DESCRIPTION:Athletics - Women's Javelin Throw Final
-SUMMARY:🏃 Women's Javelin Throw Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T174000Z-taekwondo-WOMEN-67KG-REPECHAGE
 DTSTAMP:20240810T174000Z
 DTSTART:20240810T174000Z
@@ -32608,15 +32615,6 @@ SUMMARY:🤼 Men's Freestyle 74kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174500Z-athletics-WOMENS-100M-HURDLES-FINAL
-DTSTAMP:20240810T174500Z
-DTSTART:20240810T174500Z
-DTEND:20240810T174600Z
-DESCRIPTION:Athletics - Women's 100m Hurdles Final
-SUMMARY:🏃 Women's 100m Hurdles Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T174900Z-cycling-track-WOMENS-SPRINT-QUARTERFINALS-RACE-2
 DTSTAMP:20240810T174900Z
 DTSTART:20240810T174900Z
@@ -32626,6 +32624,15 @@ SUMMARY:🚴 Women's Sprint, Quarterfinals - Race 2
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T175000Z-athletics-MENS-5000M-FINAL
+DTSTAMP:20240810T175000Z
+DTSTART:20240810T175000Z
+DTEND:20240810T180500Z
+DESCRIPTION:Athletics - Men's 5000m Final
+SUMMARY:🏃 Men's 5000m Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T175300Z-taekwondo-MEN-80KG-REPECHAGE
 DTSTAMP:20240810T175300Z
 DTSTART:20240810T175300Z
@@ -32644,15 +32651,6 @@ SUMMARY:🤼 Men's Freestyle 74kg Final
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T180000Z-athletics-MENS-5000M-FINAL
-DTSTAMP:20240810T180000Z
-DTSTART:20240810T180000Z
-DTEND:20240810T181500Z
-DESCRIPTION:Athletics - Men's 5000m Final
-SUMMARY:🏃 Men's 5000m Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T180000Z-breaking-B-BOYS-QUARTERFINAL-1
 DTSTAMP:20240810T180000Z
 DTSTART:20240810T180000Z
@@ -32707,6 +32705,15 @@ SUMMARY:🚴 Women's Sprint, Quarterfinals - Decider
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T181500Z-athletics-WOMENS-1500M-FINAL
+DTSTAMP:20240810T181500Z
+DTSTART:20240810T181500Z
+DTEND:20240810T181900Z
+DESCRIPTION:Athletics - Women's 1500m Final
+SUMMARY:🏃 Women's 1500m Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T181500Z-wrestling-MENS-FREESTYLE-125KG-BRONZE-MEDAL-MATCH
 DTSTAMP:20240810T181500Z
 DTSTART:20240810T181500Z
@@ -32734,15 +32741,6 @@ SUMMARY:🤸 B-Boys Quarterfinal 4
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T182500Z-athletics-WOMENS-1500M-FINAL
-DTSTAMP:20240810T182500Z
-DTSTART:20240810T182500Z
-DTEND:20240810T182900Z
-DESCRIPTION:Athletics - Women's 1500m Final
-SUMMARY:🏃 Women's 1500m Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T183000Z-weightlifting-MENS-102KG
 DTSTAMP:20240810T183000Z
 DTSTART:20240810T183000Z
@@ -32806,6 +32804,15 @@ SUMMARY:🤸 B-Boys Semifinal 2
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T190000Z-athletics-MENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T190000Z
+DTSTART:20240810T190000Z
+DTEND:20240810T190300Z
+DESCRIPTION:Athletics - Men's 4 x 400m Relay Final
+SUMMARY:🏃 Men's 4 x 400m Relay Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T190000Z-beach-volleyball-MENS-BRONZE-MEDAL-MATCH
 DTSTAMP:20240810T190000Z
 DTSTART:20240810T190000Z
@@ -32833,12 +32840,12 @@ SUMMARY:🥋 Women +67kg Bronze Medal Contests
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T191200Z-athletics-MENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T191200Z
-DTSTART:20240810T191200Z
-DTEND:20240810T191500Z
-DESCRIPTION:Athletics - Men's 4 x 400m Relay Final
-SUMMARY:🏃 Men's 4 x 400m Relay Final
+UID:20240810T191400Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T191400Z
+DTSTART:20240810T191400Z
+DTEND:20240810T191800Z
+DESCRIPTION:Athletics - Women's 4 x 400m Relay Final
+SUMMARY:🏃 Women's 4 x 400m Relay Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
@@ -32869,15 +32876,6 @@ SUMMARY:🥋 Men +80kg Gold Medal Contest
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T192200Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T192200Z
-DTSTART:20240810T192200Z
-DTEND:20240810T192600Z
-DESCRIPTION:Athletics - Women's 4 x 400m Relay Final
-SUMMARY:🏃 Women's 4 x 400m Relay Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T192400Z-breaking-B-BOYS-GOLD-MEDAL-BATTLE
 DTSTAMP:20240810T192400Z
 DTSTART:20240810T192400Z
diff --git a/docs/medals/HKG.ics b/docs/medals/HKG.ics
index c2033b62e..785593d64 100644
--- a/docs/medals/HKG.ics
+++ b/docs/medals/HKG.ics
@@ -25,13 +25,12 @@ SUMMARY:🏊 Women's 200m Freestyle Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
 DTSTAMP:20240729T201000Z
 DTSTART:20240729T201000Z
 DTEND:20240729T204000Z
-DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout\n🇭🇰 CHEUNG Ka
-  Long
-SUMMARY:🤺 Men's Foil Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/medals/ITA.ics b/docs/medals/ITA.ics
index ebb4a3aa6..4744a0377 100644
--- a/docs/medals/ITA.ics
+++ b/docs/medals/ITA.ics
@@ -272,6 +272,15 @@ SUMMARY:🏊 Women's 100m Breaststroke Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
+DTSTAMP:20240729T201000Z
+DTSTART:20240729T201000Z
+DTEND:20240729T204000Z
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/medals/JPN.ics b/docs/medals/JPN.ics
index b0fb5d70d..ca8146fec 100644
--- a/docs/medals/JPN.ics
+++ b/docs/medals/JPN.ics
@@ -187,13 +187,12 @@ SUMMARY:🏊 Men's 200m Freestyle Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
 DTSTAMP:20240729T191500Z
 DTSTART:20240729T191500Z
 DTEND:20240729T194500Z
-DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout\n🇯🇵 IIMURA
-  Kazuki
-SUMMARY:🤺 Men's Foil Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/medals/USA.ics b/docs/medals/USA.ics
index 1f91842af..0cb81fba2 100644
--- a/docs/medals/USA.ics
+++ b/docs/medals/USA.ics
@@ -279,6 +279,15 @@ SUMMARY:🏊 Men's 200m Freestyle Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
+DTSTAMP:20240729T191500Z
+DTSTART:20240729T191500Z
+DTEND:20240729T194500Z
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T192700Z-swimming-MENS-100M-BACKSTROKE-FINAL
 DTSTAMP:20240729T192700Z
 DTSTART:20240729T192700Z
diff --git a/docs/medals/general.ics b/docs/medals/general.ics
index afc14d80d..f7c3e6dcf 100644
--- a/docs/medals/general.ics
+++ b/docs/medals/general.ics
@@ -655,13 +655,12 @@ SUMMARY:🤺 CHOI Sebin 🇰🇷 - 🇺🇦 Olga KHARLAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240729T191500Z-fencing-MENS-FOIL-INDIVIDUAL-BRONZE-MEDAL-BOUT-USA-JPN
 DTSTAMP:20240729T191500Z
 DTSTART:20240729T191500Z
 DTEND:20240729T194500Z
-DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout\n🇯🇵 IIMURA
-  Kazuki
-SUMMARY:🤺 Men's Foil Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Bronze Medal Bout
+SUMMARY:🤺 Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -709,13 +708,12 @@ SUMMARY:🏊 Women's 200m Freestyle Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240729T201000Z-fencing-MENS-FOIL-INDIVIDUAL-GOLD-MEDAL-BOUT-ITA-HKG
 DTSTAMP:20240729T201000Z
 DTSTART:20240729T201000Z
 DTEND:20240729T204000Z
-DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout\n🇭🇰 CHEUNG Ka
-  Long
-SUMMARY:🤺 Men's Foil Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Foil Individual Gold Medal Bout
+SUMMARY:🤺 Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -2247,10 +2245,10 @@ SUMMARY:🏊 Women's 4 x 100m Medley Relay Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240804T175000Z-athletics-WOMENS-HIGH-JUMP-FINAL
-DTSTAMP:20240804T175000Z
-DTSTART:20240804T175000Z
-DTEND:20240804T193500Z
+UID:20240804T175500Z-athletics-WOMENS-HIGH-JUMP-FINAL
+DTSTAMP:20240804T175500Z
+DTSTART:20240804T175500Z
+DTEND:20240804T194000Z
 DESCRIPTION:Athletics - Women's High Jump Final
 SUMMARY:🏃 Women's High Jump Final
 LOCATION:Stade de France
@@ -2436,10 +2434,10 @@ SUMMARY:🏀 Women's Bronze Medal Game
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T191000Z-athletics-WOMENS-5000M-FINAL
-DTSTAMP:20240805T191000Z
-DTSTART:20240805T191000Z
-DTEND:20240805T192700Z
+UID:20240805T191500Z-athletics-WOMENS-5000M-FINAL
+DTSTAMP:20240805T191500Z
+DTSTART:20240805T191500Z
+DTEND:20240805T193200Z
 DESCRIPTION:Athletics - Women's 5000m Final
 SUMMARY:🏃 Women's 5000m Final
 LOCATION:Stade de France
@@ -2454,10 +2452,10 @@ SUMMARY:🏀 Men's Bronze Medal Game
 LOCATION:La Concorde 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240805T194500Z-athletics-WOMENS-800M-FINAL
-DTSTAMP:20240805T194500Z
-DTSTART:20240805T194500Z
-DTEND:20240805T194700Z
+UID:20240805T194700Z-athletics-WOMENS-800M-FINAL
+DTSTAMP:20240805T194700Z
+DTSTART:20240805T194700Z
+DTEND:20240805T194900Z
 DESCRIPTION:Athletics - Women's 800m Final
 SUMMARY:🏃 Women's 800m Final
 LOCATION:Stade de France
@@ -2544,15 +2542,6 @@ SUMMARY:🤼 Men's Greco-Roman 60kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T175500Z-athletics-WOMENS-HAMMER-THROW-FINAL
-DTSTAMP:20240806T175500Z
-DTSTART:20240806T175500Z
-DTEND:20240806T190500Z
-DESCRIPTION:Athletics - Women's Hammer Throw Final
-SUMMARY:🏃 Women's Hammer Throw Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240806T175500Z-wrestling-MENS-GRECO-ROMAN-60KG-FINAL
 DTSTAMP:20240806T175500Z
 DTSTART:20240806T175500Z
@@ -2562,6 +2551,15 @@ SUMMARY:🤼 Men's Greco-Roman 60kg Final
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T175700Z-athletics-WOMENS-HAMMER-THROW-FINAL
+DTSTAMP:20240806T175700Z
+DTSTART:20240806T175700Z
+DTEND:20240806T190700Z
+DESCRIPTION:Athletics - Women's Hammer Throw Final
+SUMMARY:🏃 Women's Hammer Throw Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T180500Z-cycling-track-MENS-TEAM-SPRINT-FINALS-FOR-BRONZE
 DTSTAMP:20240806T180500Z
 DTSTART:20240806T180500Z
@@ -2643,10 +2641,10 @@ SUMMARY:🤼 Women's Freestyle 68kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T191000Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240806T191000Z
-DTSTART:20240806T191000Z
-DTEND:20240806T192000Z
+UID:20240806T191400Z-athletics-WOMENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240806T191400Z
+DTSTART:20240806T191400Z
+DTEND:20240806T192400Z
 DESCRIPTION:Athletics - Women's 3000m Steeplechase Final
 SUMMARY:🏃 Women's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -3012,10 +3010,10 @@ SUMMARY:🥋 Men -58kg Gold Medal Contest
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T194000Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
-DTSTAMP:20240807T194000Z
-DTSTART:20240807T194000Z
-DTEND:20240807T194900Z
+UID:20240807T194300Z-athletics-MENS-3000M-STEEPLECHASE-FINAL
+DTSTAMP:20240807T194300Z
+DTSTART:20240807T194300Z
+DTEND:20240807T195200Z
 DESCRIPTION:Athletics - Men's 3000m Steeplechase Final
 SUMMARY:🏃 Men's 3000m Steeplechase Final
 LOCATION:Stade de France
@@ -3705,6 +3703,15 @@ SUMMARY:🤼 Men's Freestyle 57kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240809T173700Z-athletics-WOMENS-SHOT-PUT-FINAL
+DTSTAMP:20240809T173700Z
+DTSTART:20240809T173700Z
+DTEND:20240809T184700Z
+DESCRIPTION:Athletics - Women's Shot Put Final
+SUMMARY:🏃 Women's Shot Put Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T173800Z-cycling-track-MENS-SPRINT-FINALS-DECIDER
 DTSTAMP:20240809T173800Z
 DTSTART:20240809T173800Z
@@ -3714,15 +3721,6 @@ SUMMARY:🚴 Men's Sprint, Finals - Decider
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174000Z-athletics-WOMENS-SHOT-PUT-FINAL
-DTSTAMP:20240809T174000Z
-DTSTART:20240809T174000Z
-DTEND:20240809T185000Z
-DESCRIPTION:Athletics - Women's Shot Put Final
-SUMMARY:🏃 Women's Shot Put Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240809T174000Z-wrestling-MENS-FREESTYLE-57KG-BRONZE-MEDAL-MATCH
 DTSTAMP:20240809T174000Z
 DTSTART:20240809T174000Z
@@ -3732,10 +3730,10 @@ SUMMARY:🤼 Men's Freestyle 57kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T174500Z-athletics-MENS-4-X-100M-RELAY-FINAL
-DTSTAMP:20240809T174500Z
-DTSTART:20240809T174500Z
-DTEND:20240809T174600Z
+UID:20240809T174700Z-athletics-MENS-4-X-100M-RELAY-FINAL
+DTSTAMP:20240809T174700Z
+DTSTART:20240809T174700Z
+DTEND:20240809T174800Z
 DESCRIPTION:Athletics - Men's 4 x 100m Relay Final
 SUMMARY:🏃 Men's 4 x 100m Relay Final
 LOCATION:Stade de France
@@ -3777,24 +3775,15 @@ SUMMARY:🤼 Men's Freestyle 86kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181000Z-athletics-MENS-TRIPLE-JUMP-FINAL
-DTSTAMP:20240809T181000Z
-DTSTART:20240809T181000Z
-DTEND:20240809T193500Z
+UID:20240809T181300Z-athletics-MENS-TRIPLE-JUMP-FINAL
+DTSTAMP:20240809T181300Z
+DTSTART:20240809T181300Z
+DTEND:20240809T193800Z
 DESCRIPTION:Athletics - Men's Triple Jump Final
 SUMMARY:🏃 Men's Triple Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T181500Z-athletics-WOMENS-HEPTATHLON-800M
-DTSTAMP:20240809T181500Z
-DTSTART:20240809T181500Z
-DTEND:20240809T183800Z
-DESCRIPTION:Athletics - Women's Heptathlon 800m
-SUMMARY:🏃 Women's Heptathlon 800m
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240809T181500Z-wrestling-MENS-FREESTYLE-86KG-BRONZE-MEDAL-MATCH
 DTSTAMP:20240809T181500Z
 DTSTART:20240809T181500Z
@@ -3813,6 +3802,15 @@ SUMMARY:🥋 Women -67kg Bronze Medal Contests
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240809T182500Z-athletics-WOMENS-HEPTATHLON-800M
+DTSTAMP:20240809T182500Z
+DTSTART:20240809T182500Z
+DTEND:20240809T184800Z
+DESCRIPTION:Athletics - Women's Heptathlon 800m
+SUMMARY:🏃 Women's Heptathlon 800m
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T183000Z-wrestling-MENS-FREESTYLE-86KG-FINAL
 DTSTAMP:20240809T183000Z
 DTSTART:20240809T183000Z
@@ -3849,10 +3847,10 @@ SUMMARY:🤼 Women's Freestyle 57kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240809T185500Z-athletics-WOMENS-10000M-FINAL
-DTSTAMP:20240809T185500Z
-DTSTART:20240809T185500Z
-DTEND:20240809T192900Z
+UID:20240809T185700Z-athletics-WOMENS-10000M-FINAL
+DTSTAMP:20240809T185700Z
+DTSTART:20240809T185700Z
+DTEND:20240809T193100Z
 DESCRIPTION:Athletics - Women's 10,000m Final
 SUMMARY:🏃 Women's 10,000m Final
 LOCATION:Stade de France
@@ -4173,15 +4171,24 @@ SUMMARY:🚴 Men's Madison, Final
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T171000Z-athletics-MENS-HIGH-JUMP-FINAL
-DTSTAMP:20240810T171000Z
-DTSTART:20240810T171000Z
-DTEND:20240810T190300Z
+UID:20240810T170000Z-athletics-MENS-HIGH-JUMP-FINAL
+DTSTAMP:20240810T170000Z
+DTSTART:20240810T170000Z
+DTEND:20240810T185300Z
 DESCRIPTION:Athletics - Men's High Jump Final
 SUMMARY:🏃 Men's High Jump Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T170500Z-athletics-MENS-800M-FINAL
+DTSTAMP:20240810T170500Z
+DTSTART:20240810T170500Z
+DTEND:20240810T170700Z
+DESCRIPTION:Athletics - Men's 800m Final
+SUMMARY:🏃 Men's 800m Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T171000Z-modern-pentathlon-MENS-INDIVIDUAL-FINAL-LASER-RUN
 DTSTAMP:20240810T171000Z
 DTSTART:20240810T171000Z
@@ -4191,15 +4198,6 @@ SUMMARY:🤺 Men's Individual, Final, Laser Run
 LOCATION:Château de Versailles
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T172500Z-athletics-MENS-800M-FINAL
-DTSTAMP:20240810T172500Z
-DTSTART:20240810T172500Z
-DTEND:20240810T172700Z
-DESCRIPTION:Athletics - Men's 800m Final
-SUMMARY:🏃 Men's 800m Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T173000Z-artistic-swimming-DUET-FREE-ROUTINE
 DTSTAMP:20240810T173000Z
 DTSTART:20240810T173000Z
@@ -4209,6 +4207,15 @@ SUMMARY:🏊 Duet Free Routine
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T173000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
+DTSTAMP:20240810T173000Z
+DTSTART:20240810T173000Z
+DTEND:20240810T184800Z
+DESCRIPTION:Athletics - Women's Javelin Throw Final
+SUMMARY:🏃 Women's Javelin Throw Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T173000Z-wrestling-MENS-FREESTYLE-74KG-BRONZE-MEDAL-MATCH
 DTSTAMP:20240810T173000Z
 DTSTART:20240810T173000Z
@@ -4218,12 +4225,12 @@ SUMMARY:🤼 Men's Freestyle 74kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174000Z-athletics-WOMENS-JAVELIN-THROW-FINAL
-DTSTAMP:20240810T174000Z
-DTSTART:20240810T174000Z
-DTEND:20240810T185800Z
-DESCRIPTION:Athletics - Women's Javelin Throw Final
-SUMMARY:🏃 Women's Javelin Throw Final
+UID:20240810T173500Z-athletics-WOMENS-100M-HURDLES-FINAL
+DTSTAMP:20240810T173500Z
+DTSTART:20240810T173500Z
+DTEND:20240810T173600Z
+DESCRIPTION:Athletics - Women's 100m Hurdles Final
+SUMMARY:🏃 Women's 100m Hurdles Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
@@ -4236,12 +4243,12 @@ SUMMARY:🤼 Men's Freestyle 74kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T174500Z-athletics-WOMENS-100M-HURDLES-FINAL
-DTSTAMP:20240810T174500Z
-DTSTART:20240810T174500Z
-DTEND:20240810T174600Z
-DESCRIPTION:Athletics - Women's 100m Hurdles Final
-SUMMARY:🏃 Women's 100m Hurdles Final
+UID:20240810T175000Z-athletics-MENS-5000M-FINAL
+DTSTAMP:20240810T175000Z
+DTSTART:20240810T175000Z
+DTEND:20240810T180500Z
+DESCRIPTION:Athletics - Men's 5000m Final
+SUMMARY:🏃 Men's 5000m Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
@@ -4254,15 +4261,6 @@ SUMMARY:🤼 Men's Freestyle 74kg Final
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T180000Z-athletics-MENS-5000M-FINAL
-DTSTAMP:20240810T180000Z
-DTSTART:20240810T180000Z
-DTEND:20240810T181500Z
-DESCRIPTION:Athletics - Men's 5000m Final
-SUMMARY:🏃 Men's 5000m Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T180500Z-wrestling-MENS-FREESTYLE-125KG-BRONZE-MEDAL-MATCH
 DTSTAMP:20240810T180500Z
 DTSTART:20240810T180500Z
@@ -4272,6 +4270,15 @@ SUMMARY:🤼 Men's Freestyle 125kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T181500Z-athletics-WOMENS-1500M-FINAL
+DTSTAMP:20240810T181500Z
+DTSTART:20240810T181500Z
+DTEND:20240810T181900Z
+DESCRIPTION:Athletics - Women's 1500m Final
+SUMMARY:🏃 Women's 1500m Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T181500Z-wrestling-MENS-FREESTYLE-125KG-BRONZE-MEDAL-MATCH
 DTSTAMP:20240810T181500Z
 DTSTART:20240810T181500Z
@@ -4290,15 +4297,6 @@ SUMMARY:🥋 Men +80kg Bronze Medal Contests
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T182500Z-athletics-WOMENS-1500M-FINAL
-DTSTAMP:20240810T182500Z
-DTSTART:20240810T182500Z
-DTEND:20240810T182900Z
-DESCRIPTION:Athletics - Women's 1500m Final
-SUMMARY:🏃 Women's 1500m Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T183000Z-weightlifting-MENS-102KG
 DTSTAMP:20240810T183000Z
 DTSTART:20240810T183000Z
@@ -4344,6 +4342,15 @@ SUMMARY:🤼 Women's Freestyle 62kg Bronze Medal Match
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240810T190000Z-athletics-MENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T190000Z
+DTSTART:20240810T190000Z
+DTEND:20240810T190300Z
+DESCRIPTION:Athletics - Men's 4 x 400m Relay Final
+SUMMARY:🏃 Men's 4 x 400m Relay Final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240810T190000Z-beach-volleyball-MENS-BRONZE-MEDAL-MATCH
 DTSTAMP:20240810T190000Z
 DTSTART:20240810T190000Z
@@ -4371,12 +4378,12 @@ SUMMARY:🥋 Women +67kg Bronze Medal Contests
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T191200Z-athletics-MENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T191200Z
-DTSTART:20240810T191200Z
-DTEND:20240810T191500Z
-DESCRIPTION:Athletics - Men's 4 x 400m Relay Final
-SUMMARY:🏃 Men's 4 x 400m Relay Final
+UID:20240810T191400Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
+DTSTAMP:20240810T191400Z
+DTSTART:20240810T191400Z
+DTEND:20240810T191800Z
+DESCRIPTION:Athletics - Women's 4 x 400m Relay Final
+SUMMARY:🏃 Women's 4 x 400m Relay Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
@@ -4407,15 +4414,6 @@ SUMMARY:🥋 Men +80kg Gold Medal Contest
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240810T192200Z-athletics-WOMENS-4-X-400M-RELAY-FINAL
-DTSTAMP:20240810T192200Z
-DTSTART:20240810T192200Z
-DTEND:20240810T192600Z
-DESCRIPTION:Athletics - Women's 4 x 400m Relay Final
-SUMMARY:🏃 Women's 4 x 400m Relay Final
-LOCATION:Stade de France
-END:VEVENT
-BEGIN:VEVENT
 UID:20240810T192400Z-breaking-B-BOYS-GOLD-MEDAL-BATTLE
 DTSTAMP:20240810T192400Z
 DTSTART:20240810T192400Z
diff --git a/docs/surfing/FRA.ics b/docs/surfing/FRA.ics
index 1f2e73833..ac388e6c5 100644
--- a/docs/surfing/FRA.ics
+++ b/docs/surfing/FRA.ics
@@ -62,12 +62,12 @@ SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇿🇦 Matthew McGILLIVRAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-USA-FRA
+UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-FRA-USA
 DTSTAMP:20240729T181200Z
 DTSTART:20240729T181200Z
 DTEND:20240729T184200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 3
-SUMMARY:🏄 Griffin COLAPINTO 🇺🇸 - 🇫🇷 Kauli VAAST
+SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇺🇸 Griffin COLAPINTO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/USA.ics b/docs/surfing/USA.ics
index a8d7ea917..b950b9f41 100644
--- a/docs/surfing/USA.ics
+++ b/docs/surfing/USA.ics
@@ -54,12 +54,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-USA-FRA
+UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-FRA-USA
 DTSTAMP:20240729T181200Z
 DTSTART:20240729T181200Z
 DTEND:20240729T184200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 3
-SUMMARY:🏄 Griffin COLAPINTO 🇺🇸 - 🇫🇷 Kauli VAAST
+SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇺🇸 Griffin COLAPINTO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index bad87aa9c..890fd7291 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -326,12 +326,12 @@ SUMMARY:🏄 INABA Reo 🇯🇵 - 🇧🇷 Filipe TOLEDO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-USA-FRA
+UID:20240729T181200Z-surfing-MENS-ROUND-3-HEAT-3-FRA-USA
 DTSTAMP:20240729T181200Z
 DTSTART:20240729T181200Z
 DTEND:20240729T184200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 3
-SUMMARY:🏄 Griffin COLAPINTO 🇺🇸 - 🇫🇷 Kauli VAAST
+SUMMARY:🏄 Kauli VAAST 🇫🇷 - 🇺🇸 Griffin COLAPINTO
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 06a0a29e3..0d39d9bb2 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -14862,7 +14862,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T181200Z" data-end="20240729T184200Z" data-noc="USA,FRA">
+<div class="event py-4" data-start="20240729T181200Z" data-end="20240729T184200Z" 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">
@@ -14870,7 +14870,7 @@
    SURFING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Griffin COLAPINTO 🇺🇸 - 🇫🇷 Kauli VAAST
+   <div class="">Kauli VAAST 🇫🇷 - 🇺🇸 Griffin COLAPINTO
    </div>
  </div>
 </div>
@@ -15213,7 +15213,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T191500Z" data-end="20240729T194500Z" data-noc="JPN">
+<div class="event py-4" data-start="20240729T191500Z" data-end="20240729T194500Z" data-noc="USA,JPN">
  <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">
@@ -15221,8 +15221,7 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Foil Individual Bronze Medal Bout
-<div class="competitor JPN">🇯🇵 IIMURA Kazuki</div>
+   <div class="">Nick ITKIN 🇺🇸 - 🇯🇵 IIMURA Kazuki
    </div>
  </div>
 </div>
@@ -15453,7 +15452,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T201000Z" data-end="20240729T204000Z" data-noc="HKG">
+<div class="event py-4" data-start="20240729T201000Z" data-end="20240729T204000Z" data-noc="ITA,HKG">
  <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">
@@ -15461,8 +15460,7 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Foil Individual Gold Medal Bout
-<div class="competitor HKG">🇭🇰 CHEUNG Ka Long</div>
+   <div class="">Filippo MACCHI 🇮🇹 - 🇭🇰 CHEUNG Ka Long
    </div>
  </div>
 </div>
@@ -28774,18 +28772,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240802T090500Z" data-end="20240802T093100Z" 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">
-   
-   ATHLETICS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's 1500m Round 1
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240802T090600Z" data-end="20240802T091200Z" data-noc="TJK">
  <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">
@@ -28823,6 +28809,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240802T091000Z" data-end="20240802T093600Z" 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">
+   
+   ATHLETICS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's 1500m Round 1
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240802T091200Z" data-end="20240802T091800Z" data-noc="UZB">
  <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">
@@ -31669,18 +31667,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240803T091000Z" data-end="20240803T093600Z" 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">
-   
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's 800m Repechage Round
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240803T091000Z" data-end="20240803T091700Z" 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">
@@ -31693,6 +31679,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240803T092000Z" data-end="20240803T094600Z" 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">
+   
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's 800m Repechage Round
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240803T092500Z" data-end="20240803T103200Z" 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">
@@ -31727,7 +31725,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240803T094500Z" data-end="20240803T103400Z" data-noc="">
+<div class="event py-4" data-start="20240803T095500Z" data-end="20240803T104400Z" 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">
@@ -31739,18 +31737,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240803T100000Z" data-end="20240803T103600Z" 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">
-   
-   ATHLETICS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Decathlon Discus Throw - Group B
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240803T100000Z" data-end="20240803T105000Z" data-noc="ESP,GER">
  <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">
@@ -31810,6 +31796,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240803T100500Z" data-end="20240803T104100Z" 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">
+   
+   ATHLETICS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Decathlon Discus Throw - Group B
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240803T100500Z" data-end="20240803T113000Z" data-noc="CRO,GRE">
  <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">
@@ -34731,7 +34729,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240804T175000Z" data-end="20240804T193500Z" data-noc="">
+<div class="event py-4" data-start="20240804T175500Z" data-end="20240804T194000Z" 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">
@@ -34743,18 +34741,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240804T180000Z" data-end="20240804T181700Z" 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">
-   
-   ATHLETICS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's 100m Semi-Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240804T180000Z" data-end="20240804T194500Z" 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">
@@ -34767,6 +34753,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240804T180500Z" data-end="20240804T182200Z" 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">
+   
+   ATHLETICS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's 100m Semi-Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240804T180500Z" data-end="20240804T193000Z" data-noc="FRA,GRE">
  <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">
@@ -36275,18 +36273,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T191000Z" data-end="20240805T192700Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's 5000m Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240805T191000Z" data-end="20240805T192000Z" 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">
@@ -36299,6 +36285,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240805T191500Z" data-end="20240805T193200Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's 5000m Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240805T192000Z" data-end="20240805T193000Z" 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">
@@ -36359,7 +36357,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240805T194500Z" data-end="20240805T194700Z" data-noc="">
+<div class="event py-4" data-start="20240805T194700Z" data-end="20240805T194900Z" 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">
@@ -37465,18 +37463,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T175500Z" data-end="20240806T190500Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Hammer Throw Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240806T175500Z" data-end="20240806T175900Z" 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">
@@ -37501,6 +37487,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240806T175700Z" data-end="20240806T190700Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Hammer Throw Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240806T180000Z" data-end="20240806T180400Z" 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">
@@ -37691,7 +37689,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T191000Z" data-end="20240806T192000Z" data-noc="">
+<div class="event py-4" data-start="20240806T191400Z" data-end="20240806T192400Z" 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">
@@ -39665,7 +39663,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240807T194000Z" data-end="20240807T194900Z" data-noc="">
+<div class="event py-4" data-start="20240807T194300Z" data-end="20240807T195200Z" 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">
@@ -42254,18 +42252,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240809T092000Z" data-end="20240809T100200Z" 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">
-   
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Heptathlon Javelin Throw - Group A
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240809T092000Z" data-end="20240809T092700Z" 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">
@@ -42278,6 +42264,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240809T092300Z" data-end="20240809T100500Z" 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">
+   
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Heptathlon Javelin Throw - Group A
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240809T092400Z" data-end="20240809T093600Z" 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">
@@ -42434,7 +42432,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240809T103000Z" data-end="20240809T111200Z" data-noc="">
+<div class="event py-4" data-start="20240809T103200Z" data-end="20240809T111400Z" 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">
@@ -43274,6 +43272,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240809T173700Z" data-end="20240809T184700Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Shot Put Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240809T173800Z" data-end="20240809T174600Z" 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">
@@ -43286,18 +43296,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240809T174000Z" data-end="20240809T185000Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Shot Put Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240809T174000Z" data-end="20240809T175300Z" 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">
@@ -43322,7 +43320,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240809T174500Z" data-end="20240809T174600Z" data-noc="">
+<div class="event py-4" data-start="20240809T174700Z" data-end="20240809T174800Z" 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">
@@ -43442,7 +43440,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240809T181000Z" data-end="20240809T193500Z" data-noc="">
+<div class="event py-4" data-start="20240809T181300Z" data-end="20240809T193800Z" 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">
@@ -43466,18 +43464,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240809T181500Z" data-end="20240809T183800Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Heptathlon 800m
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240809T181500Z" data-end="20240809T182500Z" 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">
@@ -43514,6 +43500,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240809T182500Z" data-end="20240809T184800Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Heptathlon 800m
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240809T183000Z" data-end="20240809T184000Z" 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">
@@ -43586,7 +43584,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240809T185500Z" data-end="20240809T192900Z" data-noc="">
+<div class="event py-4" data-start="20240809T185700Z" data-end="20240809T193100Z" 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">
@@ -44930,6 +44928,30 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240810T170000Z" data-end="20240810T185300Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's High Jump Final
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240810T170500Z" data-end="20240810T170700Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's 800m Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240810T170500Z" data-end="20240810T171500Z" 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">
@@ -44954,18 +44976,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T171000Z" data-end="20240810T190300Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's High Jump Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240810T171000Z" data-end="20240810T173000Z" 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">
@@ -44990,18 +45000,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T172500Z" data-end="20240810T172700Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's 800m Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240810T173000Z" data-end="20240810T192300Z" 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">
@@ -45014,6 +45012,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240810T173000Z" data-end="20240810T184800Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's Javelin Throw Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240810T173000Z" data-end="20240810T174000Z" 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">
@@ -45038,6 +45048,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240810T173500Z" data-end="20240810T173600Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's 100m Hurdles Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240810T173500Z" data-end="20240810T190000Z" 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">
@@ -45050,18 +45072,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T174000Z" data-end="20240810T185800Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Javelin Throw Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240810T174000Z" data-end="20240810T175300Z" 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">
@@ -45086,18 +45096,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T174500Z" data-end="20240810T174600Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's 100m Hurdles Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240810T174900Z" data-end="20240810T180300Z" 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">
@@ -45110,6 +45108,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240810T175000Z" data-end="20240810T180500Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's 5000m Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240810T175300Z" data-end="20240810T180600Z" 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">
@@ -45134,18 +45144,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T180000Z" data-end="20240810T181500Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's 5000m Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240810T180000Z" data-end="20240810T180700Z" 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">
@@ -45218,6 +45216,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240810T181500Z" data-end="20240810T181900Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Women's 1500m Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240810T181500Z" data-end="20240810T182500Z" 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">
@@ -45254,18 +45264,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T182500Z" data-end="20240810T182900Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's 1500m Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240810T183000Z" data-end="20240810T210000Z" 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">
@@ -45350,6 +45348,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240810T190000Z" data-end="20240810T190300Z" 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">
+   🏅
+   ATHLETICS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's 4 x 400m Relay Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240810T190000Z" data-end="20240810T195000Z" 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">
@@ -45386,15 +45396,15 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T191200Z" data-end="20240810T191500Z" data-noc="">
+<div class="event py-4" data-start="20240810T191400Z" data-end="20240810T191800Z" 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">
    🏅
    ATHLETICS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Men's 4 x 400m Relay Final
+   <div class="">Women's 4 x 400m Relay Final
    </div>
  </div>
 </div>
@@ -45434,18 +45444,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240810T192200Z" data-end="20240810T192600Z" 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">
-   🏅
-   ATHLETICS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's 4 x 400m Relay Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240810T192400Z" data-end="20240810T193200Z" 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">