diff --git a/docs/boxing/NED.ics b/docs/boxing/NED.ics
index 41fc91ae5..3f0f62ca6 100644
--- a/docs/boxing/NED.ics
+++ b/docs/boxing/NED.ics
@@ -12,4 +12,13 @@ DESCRIPTION:Boxing - Women's 60kg - Preliminaries - Round of 16
 SUMMARY:🥊 WON Ungyong 🇰🇵 - 🇳🇱 Chelsey HEIJNEN
 LOCATION:North Paris Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240731T200800Z-boxing-WOMENS-60KG-QUARTERFINAL
+DTSTAMP:20240731T200800Z
+DTSTART:20240731T200800Z
+DTEND:20240731T201900Z
+DESCRIPTION:Boxing - Women's 60kg - Quarterfinal\n🇳🇱 Chelsey HEIJNEN
+SUMMARY:🥊 Women's 60kg - Quarterfinal
+LOCATION:North Paris Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/boxing/general.ics b/docs/boxing/general.ics
index 2102e55de..8126d8b8c 100644
--- a/docs/boxing/general.ics
+++ b/docs/boxing/general.ics
@@ -1115,7 +1115,7 @@ UID:20240731T200800Z-boxing-WOMENS-60KG-QUARTERFINAL
 DTSTAMP:20240731T200800Z
 DTSTART:20240731T200800Z
 DTEND:20240731T201900Z
-DESCRIPTION:Boxing - Women's 60kg - Quarterfinal
+DESCRIPTION:Boxing - Women's 60kg - Quarterfinal\n🇳🇱 Chelsey HEIJNEN
 SUMMARY:🥊 Women's 60kg - Quarterfinal
 LOCATION:North Paris Arena
 END:VEVENT
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 52bce032d..9802537da 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1906,6 +1906,15 @@ SUMMARY:🏸 HOKI/KOBAYASHI 🇯🇵 - 🇨🇳 LIU/OU
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T150000Z-rugby-sevens-WOMENS-PLACING-9-10
+DTSTAMP:20240730T150000Z
+DTSTART:20240730T150000Z
+DTEND:20240730T151600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 9-10\n🇯🇵 JPN
+SUMMARY:🏉 Women's Placing 9-10
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T151000Z-canoe-slalom-WOMENS-CANOE-SINGLE-HEATS-2ND-RUN
 DTSTAMP:20240730T151000Z
 DTSTART:20240730T151000Z
diff --git a/docs/general/NED.ics b/docs/general/NED.ics
index 1998e2312..88764e63a 100644
--- a/docs/general/NED.ics
+++ b/docs/general/NED.ics
@@ -1734,6 +1734,15 @@ SUMMARY:🏑 NED 🇳🇱 - 🇨🇳 CHN
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T200800Z-boxing-WOMENS-60KG-QUARTERFINAL
+DTSTAMP:20240731T200800Z
+DTSTART:20240731T200800Z
+DTEND:20240731T201900Z
+DESCRIPTION:Boxing - Women's 60kg - Quarterfinal\n🇳🇱 Chelsey HEIJNEN
+SUMMARY:🥊 Women's 60kg - Quarterfinal
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240801T070000Z-handball-WOMENS-PRELIMINARY-ROUND-GROUP-B-NED-BRA
 DTSTAMP:20240801T070000Z
 DTSTART:20240801T070000Z
diff --git a/docs/general/RSA.ics b/docs/general/RSA.ics
index 4ca518437..2ac45023f 100644
--- a/docs/general/RSA.ics
+++ b/docs/general/RSA.ics
@@ -521,6 +521,15 @@ SUMMARY:🚴 Men's Park Qualification
 LOCATION:La Concorde 2
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T143000Z-rugby-sevens-WOMENS-PLACING-11-12
+DTSTAMP:20240730T143000Z
+DTSTART:20240730T143000Z
+DTEND:20240730T144600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 11-12\n🇿🇦 RSA
+SUMMARY:🏉 Women's Placing 11-12
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T060000Z-triathlon-WOMENS-INDIVIDUAL
 DTSTAMP:20240731T060000Z
 DTSTART:20240731T060000Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 32344da95..af835bcef 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -11706,7 +11706,7 @@ BEGIN:VEVENT
 UID:20240730T090000Z-swimming-MENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240730T090000Z
 DTSTART:20240730T090000Z
-DTEND:20240730T091400Z
+DTEND:20240730T091751Z
 DESCRIPTION:Swimming - Men's 200m Butterfly - Heats
 SUMMARY:🏊 Men's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
@@ -11794,15 +11794,6 @@ SUMMARY:🥋 Cristina CABANA PEREZ 🇪🇸 - 🇧🇷 Ketleyn QUADROS
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T091500Z-swimming-MENS-100M-FREESTYLE-HEATS
-DTSTAMP:20240730T091500Z
-DTSTART:20240730T091500Z
-DTEND:20240730T094100Z
-DESCRIPTION:Swimming - Men's 100m Freestyle - Heats
-SUMMARY:🏊 Men's 100m Freestyle - Heats
-LOCATION:Paris La Defense Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T091600Z-boxing-MENS-51KG-PRELIMINARIES-ROUND-OF-16-CUB-BRA
 DTSTAMP:20240730T091600Z
 DTSTART:20240730T091600Z
@@ -11812,6 +11803,15 @@ SUMMARY:🥊 Alejandro CLARO FIZ 🇨🇺 - 🇧🇷 Michael Douglas da SILVA TR
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T091751Z-swimming-MENS-100M-FREESTYLE-HEATS
+DTSTAMP:20240730T091751Z
+DTSTART:20240730T091751Z
+DTEND:20240730T095131Z
+DESCRIPTION:Swimming - Men's 100m Freestyle - Heats
+SUMMARY:🏊 Men's 100m Freestyle - Heats
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T091800Z-judo-MEN-81-KG-ELIMINATION-ROUND-OF-32-KOR-MAR
 DTSTAMP:20240730T091800Z
 DTSTART:20240730T091800Z
@@ -11941,15 +11941,6 @@ SUMMARY:🥋 Women -63 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T094400Z-swimming-WOMENS-1500M-FREESTYLE-HEATS
-DTSTAMP:20240730T094400Z
-DTSTART:20240730T094400Z
-DTEND:20240730T103800Z
-DESCRIPTION:Swimming - Women's 1500m Freestyle - Heats
-SUMMARY:🏊 Women's 1500m Freestyle - Heats
-LOCATION:Paris La Defense Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T094800Z-boxing-MENS-80KG-PRELIMINARIES-ROUND-OF-16-CHN-DOM
 DTSTAMP:20240730T094800Z
 DTSTART:20240730T094800Z
@@ -11977,6 +11968,15 @@ SUMMARY:🥋 Women -63 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T095131Z-swimming-WOMENS-1500M-FREESTYLE-HEATS
+DTSTAMP:20240730T095131Z
+DTSTART:20240730T095131Z
+DTEND:20240730T104759Z
+DESCRIPTION:Swimming - Women's 1500m Freestyle - Heats
+SUMMARY:🏊 Women's 1500m Freestyle - Heats
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T095400Z-judo-MEN-81-KG-ELIMINATION-ROUND-OF-16
 DTSTAMP:20240730T095400Z
 DTSTART:20240730T095400Z
@@ -12031,36 +12031,6 @@ SUMMARY:🥋 Women -63 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T100000Z-tennis-M-SINGLES-2ND-RW-SINGLES-3RD-RM-DBLES-3RD-RW-DB
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles
-  2nd R/Mix Dbles 1st R
-SUMMARY:🎾 M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix 
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240730T100000Z-tennis-M-SINGLES-2ND-RW-SINGLES-3RD-RM-DBLES-3RD-RW-DB
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles
-  2nd R/Mix Dbles 1st R
-SUMMARY:🎾 M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix 
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240730T100000Z-tennis-M-SINGLES-2ND-RW-SINGLES-3RD-RM-DBLES-3RD-RW-DB
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles
-  2nd R/Mix Dbles 1st R
-SUMMARY:🎾 M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix 
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T100000Z-tennis-MENS-DOUBLES-SECOND-ROUND
 DTSTAMP:20240730T100000Z
 DTSTART:20240730T100000Z
@@ -12088,15 +12058,6 @@ SUMMARY:🎾 MONFILS/ROGER-VASSELI 🇫🇷 - 🇩🇪 KRAWIETZ/PUETZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T100000Z-tennis-MENS-SINGLES-SECOND-RNDWOMENS-SINGLES-THIRD-RND
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - Men's Singles Second Rnd/Women's Singles Third Rnd
-SUMMARY:🎾 Men's Singles Second Rnd/Women's Singles Third Rnd
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-CAN-GER
 DTSTAMP:20240730T100000Z
 DTSTART:20240730T100000Z
@@ -12497,15 +12458,6 @@ SUMMARY:🏹 Alexandra MIRCA 🇲🇩 - 🇲🇾 Syaqiera MASHAYIKH
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T103900Z-swimming-WOMENS-100M-FREESTYLE-HEATS
-DTSTAMP:20240730T103900Z
-DTSTART:20240730T103900Z
-DTEND:20240730T105000Z
-DESCRIPTION:Swimming - Women's 100m Freestyle - Heats
-SUMMARY:🏊 Women's 100m Freestyle - Heats
-LOCATION:Paris La Defense Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T104200Z-judo-MEN-81-KG-QUARTERFINAL
 DTSTAMP:20240730T104200Z
 DTSTART:20240730T104200Z
@@ -12556,6 +12508,15 @@ SUMMARY:⛵ Women's Skiff - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T104759Z-swimming-WOMENS-100M-FREESTYLE-HEATS
+DTSTAMP:20240730T104759Z
+DTSTART:20240730T104759Z
+DTEND:20240730T110153Z
+DESCRIPTION:Swimming - Women's 100m Freestyle - Heats
+SUMMARY:🏊 Women's 100m Freestyle - Heats
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T104800Z-judo-MEN-81-KG-QUARTERFINAL
 DTSTAMP:20240730T104800Z
 DTSTART:20240730T104800Z
@@ -12565,15 +12526,6 @@ SUMMARY:🥋 Men -81 kg Quarterfinal
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T105100Z-swimming-MENS-200M-BREASTSTROKE-HEATS
-DTSTAMP:20240730T105100Z
-DTSTART:20240730T105100Z
-DTEND:20240730T110700Z
-DESCRIPTION:Swimming - Men's 200m Breaststroke - Heats
-SUMMARY:🏊 Men's 200m Breaststroke - Heats
-LOCATION:Paris La Defense Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T105200Z-archery-MENS-INDIVIDUAL-116-ELIMINATION-ROUND
 DTSTAMP:20240730T105200Z
 DTSTART:20240730T105200Z
@@ -12601,6 +12553,15 @@ SUMMARY:🏐 USA 🇺🇸 - 🇩🇪 GER
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T110153Z-swimming-MENS-200M-BREASTSTROKE-HEATS
+DTSTAMP:20240730T110153Z
+DTSTART:20240730T110153Z
+DTEND:20240730T112042Z
+DESCRIPTION:Swimming - Men's 200m Breaststroke - Heats
+SUMMARY:🏊 Men's 200m Breaststroke - Heats
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T110400Z-sailing-WOMENS-WINDSURFING-RACE-4
 DTSTAMP:20240730T110400Z
 DTSTART:20240730T110400Z
@@ -12636,15 +12597,6 @@ SUMMARY:🥊 Marcelat SAKOBI 🇨🇩 - 🇺🇿 Sitora TURDIBEKOVA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T110800Z-swimming-MENS-4-X-200M-FREESTYLE-RELAY-HEATS
-DTSTAMP:20240730T110800Z
-DTSTART:20240730T110800Z
-DTEND:20240730T112600Z
-DESCRIPTION:Swimming - Men's 4 x 200m Freestyle Relay - Heats
-SUMMARY:🏊 Men's 4 x 200m Freestyle Relay - Heats
-LOCATION:Paris La Defense Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T111500Z-hockey-MENS-POOL-B-IRL-IND
 DTSTAMP:20240730T111500Z
 DTSTART:20240730T111500Z
@@ -12679,6 +12631,15 @@ SUMMARY:🏹 Marcus D'ALMEIDA 🇧🇷 - 🇺🇦 Mykhailo USACH
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T112042Z-swimming-MENS-4-X-200M-FREESTYLE-RELAY-HEATS
+DTSTAMP:20240730T112042Z
+DTSTART:20240730T112042Z
+DTEND:20240730T114006Z
+DESCRIPTION:Swimming - Men's 4 x 200m Freestyle Relay - Heats
+SUMMARY:🏊 Men's 4 x 200m Freestyle Relay - Heats
+LOCATION:Paris La Defense Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T112400Z-boxing-WOMENS-57KG-PRELIMINARIES-ROUND-OF-32-TUR-MLI
 DTSTAMP:20240730T112400Z
 DTSTART:20240730T112400Z
@@ -13453,7 +13414,7 @@ UID:20240730T143000Z-rugby-sevens-WOMENS-PLACING-11-12
 DTSTAMP:20240730T143000Z
 DTSTART:20240730T143000Z
 DTEND:20240730T144600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 11-12
+DESCRIPTION:Rugby Sevens - Women's Placing 11-12\n🇿🇦 RSA
 SUMMARY:🏉 Women's Placing 11-12
 LOCATION:Stade de France
 END:VEVENT
@@ -13588,7 +13549,7 @@ UID:20240730T150000Z-rugby-sevens-WOMENS-PLACING-9-10
 DTSTAMP:20240730T150000Z
 DTSTART:20240730T150000Z
 DTEND:20240730T151600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 9-10
+DESCRIPTION:Rugby Sevens - Women's Placing 9-10\n🇯🇵 JPN
 SUMMARY:🏉 Women's Placing 9-10
 LOCATION:Stade de France
 END:VEVENT
@@ -13868,15 +13829,6 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T170000Z-tennis-MENS-SINGLES-SECOND-RNDWOMENS-SINGLES-THIRD-RND
-DTSTAMP:20240730T170000Z
-DTSTART:20240730T170000Z
-DTEND:20240731T030000Z
-DESCRIPTION:Tennis - Men's Singles Second Rnd/Women's Singles Third Rnd
-SUMMARY:🎾 Men's Singles Second Rnd/Women's Singles Third Rnd
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T170000Z-tennis-MENS-SINGLES-SECOND-ROUND
 DTSTAMP:20240730T170000Z
 DTSTART:20240730T170000Z
@@ -17205,7 +17157,7 @@ UID:20240731T200800Z-boxing-WOMENS-60KG-QUARTERFINAL
 DTSTAMP:20240731T200800Z
 DTSTART:20240731T200800Z
 DTEND:20240731T201900Z
-DESCRIPTION:Boxing - Women's 60kg - Quarterfinal
+DESCRIPTION:Boxing - Women's 60kg - Quarterfinal\n🇳🇱 Chelsey HEIJNEN
 SUMMARY:🥊 Women's 60kg - Quarterfinal
 LOCATION:North Paris Arena
 END:VEVENT
diff --git a/docs/rugby-sevens/JPN.ics b/docs/rugby-sevens/JPN.ics
index e8b36bd27..826ffcca2 100644
--- a/docs/rugby-sevens/JPN.ics
+++ b/docs/rugby-sevens/JPN.ics
@@ -84,4 +84,13 @@ DESCRIPTION:Rugby Sevens - Women's Placing 9-12
 SUMMARY:🏉 JPN 🇯🇵 - 🇿🇦 RSA
 LOCATION:Stade de France
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T150000Z-rugby-sevens-WOMENS-PLACING-9-10
+DTSTAMP:20240730T150000Z
+DTSTART:20240730T150000Z
+DTEND:20240730T151600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 9-10\n🇯🇵 JPN
+SUMMARY:🏉 Women's Placing 9-10
+LOCATION:Stade de France
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/rugby-sevens/RSA.ics b/docs/rugby-sevens/RSA.ics
index 1fcd58975..1a6003edd 100644
--- a/docs/rugby-sevens/RSA.ics
+++ b/docs/rugby-sevens/RSA.ics
@@ -93,4 +93,13 @@ DESCRIPTION:Rugby Sevens - Women's Placing 9-12
 SUMMARY:🏉 JPN 🇯🇵 - 🇿🇦 RSA
 LOCATION:Stade de France
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T143000Z-rugby-sevens-WOMENS-PLACING-11-12
+DTSTAMP:20240730T143000Z
+DTSTART:20240730T143000Z
+DTEND:20240730T144600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 11-12\n🇿🇦 RSA
+SUMMARY:🏉 Women's Placing 11-12
+LOCATION:Stade de France
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/rugby-sevens/general.ics b/docs/rugby-sevens/general.ics
index 30e9e56a3..2e1fd72f2 100644
--- a/docs/rugby-sevens/general.ics
+++ b/docs/rugby-sevens/general.ics
@@ -566,7 +566,7 @@ UID:20240730T143000Z-rugby-sevens-WOMENS-PLACING-11-12
 DTSTAMP:20240730T143000Z
 DTSTART:20240730T143000Z
 DTEND:20240730T144600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 11-12
+DESCRIPTION:Rugby Sevens - Women's Placing 11-12\n🇿🇦 RSA
 SUMMARY:🏉 Women's Placing 11-12
 LOCATION:Stade de France
 END:VEVENT
@@ -575,7 +575,7 @@ UID:20240730T150000Z-rugby-sevens-WOMENS-PLACING-9-10
 DTSTAMP:20240730T150000Z
 DTSTART:20240730T150000Z
 DTEND:20240730T151600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 9-10
+DESCRIPTION:Rugby Sevens - Women's Placing 9-10\n🇯🇵 JPN
 SUMMARY:🏉 Women's Placing 9-10
 LOCATION:Stade de France
 END:VEVENT
diff --git a/docs/swimming/general.ics b/docs/swimming/general.ics
index 512395b27..7e8f789d5 100644
--- a/docs/swimming/general.ics
+++ b/docs/swimming/general.ics
@@ -343,52 +343,52 @@ BEGIN:VEVENT
 UID:20240730T090000Z-swimming-MENS-200M-BUTTERFLY-HEATS
 DTSTAMP:20240730T090000Z
 DTSTART:20240730T090000Z
-DTEND:20240730T091400Z
+DTEND:20240730T091751Z
 DESCRIPTION:Swimming - Men's 200m Butterfly - Heats
 SUMMARY:🏊 Men's 200m Butterfly - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T091500Z-swimming-MENS-100M-FREESTYLE-HEATS
-DTSTAMP:20240730T091500Z
-DTSTART:20240730T091500Z
-DTEND:20240730T094100Z
+UID:20240730T091751Z-swimming-MENS-100M-FREESTYLE-HEATS
+DTSTAMP:20240730T091751Z
+DTSTART:20240730T091751Z
+DTEND:20240730T095131Z
 DESCRIPTION:Swimming - Men's 100m Freestyle - Heats
 SUMMARY:🏊 Men's 100m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T094400Z-swimming-WOMENS-1500M-FREESTYLE-HEATS
-DTSTAMP:20240730T094400Z
-DTSTART:20240730T094400Z
-DTEND:20240730T103800Z
+UID:20240730T095131Z-swimming-WOMENS-1500M-FREESTYLE-HEATS
+DTSTAMP:20240730T095131Z
+DTSTART:20240730T095131Z
+DTEND:20240730T104759Z
 DESCRIPTION:Swimming - Women's 1500m Freestyle - Heats
 SUMMARY:🏊 Women's 1500m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T103900Z-swimming-WOMENS-100M-FREESTYLE-HEATS
-DTSTAMP:20240730T103900Z
-DTSTART:20240730T103900Z
-DTEND:20240730T105000Z
+UID:20240730T104759Z-swimming-WOMENS-100M-FREESTYLE-HEATS
+DTSTAMP:20240730T104759Z
+DTSTART:20240730T104759Z
+DTEND:20240730T110153Z
 DESCRIPTION:Swimming - Women's 100m Freestyle - Heats
 SUMMARY:🏊 Women's 100m Freestyle - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T105100Z-swimming-MENS-200M-BREASTSTROKE-HEATS
-DTSTAMP:20240730T105100Z
-DTSTART:20240730T105100Z
-DTEND:20240730T110700Z
+UID:20240730T110153Z-swimming-MENS-200M-BREASTSTROKE-HEATS
+DTSTAMP:20240730T110153Z
+DTSTART:20240730T110153Z
+DTEND:20240730T112042Z
 DESCRIPTION:Swimming - Men's 200m Breaststroke - Heats
 SUMMARY:🏊 Men's 200m Breaststroke - Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T110800Z-swimming-MENS-4-X-200M-FREESTYLE-RELAY-HEATS
-DTSTAMP:20240730T110800Z
-DTSTART:20240730T110800Z
-DTEND:20240730T112600Z
+UID:20240730T112042Z-swimming-MENS-4-X-200M-FREESTYLE-RELAY-HEATS
+DTSTAMP:20240730T112042Z
+DTSTART:20240730T112042Z
+DTEND:20240730T114006Z
 DESCRIPTION:Swimming - Men's 4 x 200m Freestyle Relay - Heats
 SUMMARY:🏊 Men's 4 x 200m Freestyle Relay - Heats
 LOCATION:Paris La Defense Arena
diff --git a/docs/tennis/general.ics b/docs/tennis/general.ics
index 50bb48f04..403ec95a9 100644
--- a/docs/tennis/general.ics
+++ b/docs/tennis/general.ics
@@ -1095,36 +1095,6 @@ SUMMARY:🎾 Jessica PEGULA 🇺🇸 - 🇺🇦 Elina SVITOLINA
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T100000Z-tennis-M-SINGLES-2ND-RW-SINGLES-3RD-RM-DBLES-3RD-RW-DB
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles
-  2nd R/Mix Dbles 1st R
-SUMMARY:🎾 M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix 
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240730T100000Z-tennis-M-SINGLES-2ND-RW-SINGLES-3RD-RM-DBLES-3RD-RW-DB
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles
-  2nd R/Mix Dbles 1st R
-SUMMARY:🎾 M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix 
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240730T100000Z-tennis-M-SINGLES-2ND-RW-SINGLES-3RD-RM-DBLES-3RD-RW-DB
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles
-  2nd R/Mix Dbles 1st R
-SUMMARY:🎾 M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix 
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T100000Z-tennis-MENS-DOUBLES-SECOND-ROUND
 DTSTAMP:20240730T100000Z
 DTSTART:20240730T100000Z
@@ -1152,15 +1122,6 @@ SUMMARY:🎾 MONFILS/ROGER-VASSELI 🇫🇷 - 🇩🇪 KRAWIETZ/PUETZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T100000Z-tennis-MENS-SINGLES-SECOND-RNDWOMENS-SINGLES-THIRD-RND
-DTSTAMP:20240730T100000Z
-DTSTART:20240730T100000Z
-DTEND:20240730T200000Z
-DESCRIPTION:Tennis - Men's Singles Second Rnd/Women's Singles Third Rnd
-SUMMARY:🎾 Men's Singles Second Rnd/Women's Singles Third Rnd
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-CAN-GER
 DTSTAMP:20240730T100000Z
 DTSTART:20240730T100000Z
@@ -1422,15 +1383,6 @@ SUMMARY:🎾 Men's Doubles Second Round
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T170000Z-tennis-MENS-SINGLES-SECOND-RNDWOMENS-SINGLES-THIRD-RND
-DTSTAMP:20240730T170000Z
-DTSTART:20240730T170000Z
-DTEND:20240731T030000Z
-DESCRIPTION:Tennis - Men's Singles Second Rnd/Women's Singles Third Rnd
-SUMMARY:🎾 Men's Singles Second Rnd/Women's Singles Third Rnd
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T170000Z-tennis-MENS-SINGLES-SECOND-ROUND
 DTSTAMP:20240730T170000Z
 DTSTART:20240730T170000Z
diff --git a/docs/today.html b/docs/today.html
index 36d8cfa92..06a0a29e3 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -16417,7 +16417,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T090000Z" data-end="20240730T091400Z" data-noc="">
+<div class="event py-4" data-start="20240730T090000Z" data-end="20240730T091751Z" 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">
@@ -16537,18 +16537,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T091500Z" data-end="20240730T094100Z" 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">
-   
-   SWIMMING
-   <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 Freestyle - Heats
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T091600Z" data-end="20240730T092700Z" data-noc="CUB,BRA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -16561,6 +16549,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240730T091751Z" data-end="20240730T095131Z" 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">
+   
+   SWIMMING
+   <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 Freestyle - Heats
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240730T091800Z" data-end="20240730T092400Z" data-noc="KOR,MAR">
  <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">
@@ -16732,18 +16732,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T094400Z" data-end="20240730T103800Z" 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">
-   
-   SWIMMING
-   <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 Freestyle - Heats
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T094800Z" data-end="20240730T095900Z" data-noc="CHN,DOM">
  <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">
@@ -16780,6 +16768,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240730T095131Z" data-end="20240730T104759Z" 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">
+   
+   SWIMMING
+   <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 Freestyle - Heats
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240730T095400Z" data-end="20240730T100000Z" 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">
@@ -16853,39 +16853,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T100000Z" data-end="20240730T200000Z" 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">
-   
-   TENNIS
-   </div>
-   <div class="">M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix Dbles 1st R
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240730T100000Z" data-end="20240730T200000Z" 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">
-   
-   TENNIS
-   </div>
-   <div class="">M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix Dbles 1st R
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240730T100000Z" data-end="20240730T200000Z" 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">
-   
-   TENNIS
-   </div>
-   <div class="">M Singles 2nd R/W Singles 3rd R/M Dbles 3rd R/W Dbles 2nd R/Mix Dbles 1st R
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T100000Z" data-end="20240730T160000Z" data-noc="GBR">
  <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">
@@ -16923,17 +16890,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T100000Z" data-end="20240730T200000Z" 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">
-   
-   TENNIS
-   </div>
-   <div class="">Men's Singles Second Rnd/Women's Singles Third Rnd
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T100000Z" data-end="20240730T130000Z" data-noc="CAN,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">
@@ -17504,18 +17460,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T103900Z" data-end="20240730T105000Z" 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">
-   
-   SWIMMING
-   <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 Freestyle - Heats
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T104200Z" data-end="20240730T104800Z" 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">
@@ -17608,6 +17552,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240730T104759Z" data-end="20240730T110153Z" 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">
+   
+   SWIMMING
+   <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 Freestyle - Heats
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240730T104800Z" data-end="20240730T105400Z" 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">
@@ -17620,18 +17576,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T105100Z" data-end="20240730T110700Z" 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">
-   
-   SWIMMING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's 200m Breaststroke - Heats
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T105200Z" data-end="20240730T110500Z" 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">
@@ -17668,6 +17612,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240730T110153Z" data-end="20240730T112042Z" 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">
+   
+   SWIMMING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's 200m Breaststroke - Heats
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240730T110400Z" data-end="20240730T112500Z" data-noc="ARG,AUT,CHN,CRO,CYP,CZE,ESP,EST,FRA,GBR,GER,HKG,ISR,ITA,MEX,NED,NOR,NZL,PER,POL,SLO,SWE,TUR,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -17728,18 +17684,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T110800Z" data-end="20240730T112600Z" 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">
-   
-   SWIMMING
-   <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 200m Freestyle Relay - Heats
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T111500Z" data-end="20240730T124500Z" data-noc="IRL,IND">
  <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">
@@ -17800,6 +17744,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240730T112042Z" data-end="20240730T114006Z" 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">
+   
+   SWIMMING
+   <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 200m Freestyle Relay - Heats
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240730T112400Z" data-end="20240730T113500Z" data-noc="TUR,MLI">
  <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">
@@ -18980,7 +18936,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T143000Z" data-end="20240730T144600Z" data-noc="">
+<div class="event py-4" data-start="20240730T143000Z" data-end="20240730T144600Z" data-noc="RSA">
  <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">
@@ -19160,7 +19116,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T150000Z" data-end="20240730T151600Z" data-noc="">
+<div class="event py-4" data-start="20240730T150000Z" data-end="20240730T151600Z" data-noc="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">
@@ -19565,17 +19521,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T170000Z" data-end="20240731T030000Z" 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">
-   
-   TENNIS
-   </div>
-   <div class="">Men's Singles Second Rnd/Women's Singles Third Rnd
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240730T170000Z" data-end="20240730T200000Z" data-noc="AUT">
  <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">
@@ -24246,7 +24191,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T200800Z" data-end="20240731T201900Z" data-noc="">
+<div class="event py-4" data-start="20240731T200800Z" data-end="20240731T201900Z" data-noc="NED">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -24255,6 +24200,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's 60kg - Quarterfinal
+<div class="competitor NED">🇳🇱 Chelsey HEIJNEN</div>
    </div>
  </div>
 </div>