diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index 7aa644cea..c629cf67f 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -1183,6 +1183,15 @@ SUMMARY:🥊 Jajaira GONZALEZ 🇺🇸 - 🇧🇷 Beatriz Iasmin SOARES FERREIRA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-USA-BRA
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T192000Z-boxing-MENS-92KG-PRELIMINARIES-ROUND-OF-16-ECU-BRA
 DTSTAMP:20240729T192000Z
 DTSTART:20240729T192000Z
diff --git a/docs/general/CRO.ics b/docs/general/CRO.ics
index c64237dd5..168d40974 100644
--- a/docs/general/CRO.ics
+++ b/docs/general/CRO.ics
@@ -378,12 +378,12 @@ SUMMARY:🛶 Men's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-CRO
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇭🇷 Tomislav PUCAR
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/CZE.ics b/docs/general/CZE.ics
index d7811400d..0bc1d86af 100644
--- a/docs/general/CZE.ics
+++ b/docs/general/CZE.ics
@@ -789,6 +789,15 @@ SUMMARY:🛶 Men's Canoe Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CZE-NED
+DTSTAMP:20240729T180000Z
+DTSTART:20240729T180000Z
+DTEND:20240729T190000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Hana MATELOVA 🇨🇿 - 🇳🇱 Britt EERLAND
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T194100Z-swimming-WOMENS-200M-FREESTYLE-FINAL
 DTSTAMP:20240729T194100Z
 DTSTART:20240729T194100Z
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 4a2074c3e..b6f07fb63 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -2075,6 +2075,15 @@ SUMMARY:🏐 FRA 🇫🇷 - 🇷🇸 SRB
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-CRO
+DTSTAMP:20240729T200000Z
+DTSTART:20240729T200000Z
+DTEND:20240729T210000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/GER.ics b/docs/general/GER.ics
index 9a6eb6029..dac7cbb12 100644
--- a/docs/general/GER.ics
+++ b/docs/general/GER.ics
@@ -1107,6 +1107,15 @@ SUMMARY:🎾 KOEPFER/STRUFF 🇩🇪 - 🇭🇷 MEKTIC/PAVIC
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-GER-ITA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Men's Singles Second Round
+SUMMARY:🎾 Dominik KOEPFER 🇩🇪 - 🇮🇹 Matteo ARNALDI
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-MIXED-DOUBLES-FIRST-ROUND-GER-CZE
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
@@ -1454,6 +1463,15 @@ SUMMARY:🏑 GER 🇩🇪 - 🇳🇱 NED
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KAZ-GER
+DTSTAMP:20240729T180000Z
+DTSTART:20240729T180000Z
+DTEND:20240729T190000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Kirill GERASSIMENKO 🇰🇿 - 🇩🇪 Dang QIU
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T184000Z-swimming-MENS-200M-FREESTYLE-FINAL
 DTSTAMP:20240729T184000Z
 DTSTART:20240729T184000Z
diff --git a/docs/general/ITA.ics b/docs/general/ITA.ics
index 87562bfb2..dcdb2afe5 100644
--- a/docs/general/ITA.ics
+++ b/docs/general/ITA.ics
@@ -1211,12 +1211,12 @@ SUMMARY:🎾 DARDERI/MUSETTI 🇮🇹 - 🇨🇱 JARRY/TABILO
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND
+UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-GER-ITA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
 DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Men's Singles Second Round\n🇮🇹 Matteo ARNALDI
-SUMMARY:🎾 Men's Singles Second Round
+DESCRIPTION:Tennis - Men's Singles Second Round
+SUMMARY:🎾 Dominik KOEPFER 🇩🇪 - 🇮🇹 Matteo ARNALDI
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/KAZ.ics b/docs/general/KAZ.ics
index e2211ddc9..370dd7294 100644
--- a/docs/general/KAZ.ics
+++ b/docs/general/KAZ.ics
@@ -526,13 +526,12 @@ SUMMARY:🏸 Brian YANG 🇨🇦 - 🇰🇿 Dmitriy PANARIN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KAZ-GER
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
 DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇰🇿 Kirill
-  GERASSIMENKO
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Kirill GERASSIMENKO 🇰🇿 - 🇩🇪 Dang QIU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/NED.ics b/docs/general/NED.ics
index e10abb6b9..12afbe886 100644
--- a/docs/general/NED.ics
+++ b/docs/general/NED.ics
@@ -960,12 +960,12 @@ SUMMARY:🏑 GER 🇩🇪 - 🇳🇱 NED
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CZE-NED
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
 DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇳🇱 Britt EERLAND
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Hana MATELOVA 🇨🇿 - 🇳🇱 Britt EERLAND
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 6583f011f..7b577b7c0 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -1811,12 +1811,12 @@ SUMMARY:🏀 USA 🇺🇸 - 🇯🇵 JPN
 LOCATION:Pierre Mauroy Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-USA-BRA
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇺🇸 Lily ZHANG
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index d85f9f0d8..b86a8cf49 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -9067,15 +9067,6 @@ BEGIN:VEVENT
 UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
-DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Men's Singles Second Round\n🇮🇹 Matteo ARNALDI
-SUMMARY:🎾 Men's Singles Second Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
 DTEND:20240729T130000Z
 DESCRIPTION:Tennis - Men's Singles Second Round\n🇦🇷 Tomas Martin
   ETCHEVERRY
@@ -9110,6 +9101,15 @@ SUMMARY:🎾 Daniel EVANS 🇬🇧 - 🇬🇷 Stefanos TSITSIPAS
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-GER-ITA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Men's Singles Second Round
+SUMMARY:🎾 Dominik KOEPFER 🇩🇪 - 🇮🇹 Matteo ARNALDI
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-NOR-ITA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
@@ -10918,16 +10918,6 @@ SUMMARY:🏉 Women's Placing 9-12
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇰🇿 Kirill
-  GERASSIMENKO
-SUMMARY:🏓 Men's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-SWE
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
@@ -10937,12 +10927,21 @@ SUMMARY:🏓 Felix LEBRUN 🇫🇷 - 🇸🇪 Anton KALLBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KAZ-GER
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
 DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇳🇱 Britt EERLAND
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Kirill GERASSIMENKO 🇰🇿 - 🇩🇪 Dang QIU
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CZE-NED
+DTSTAMP:20240729T180000Z
+DTSTART:20240729T180000Z
+DTEND:20240729T190000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Hana MATELOVA 🇨🇿 - 🇳🇱 Britt EERLAND
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -11156,15 +11155,6 @@ SUMMARY:🏓 KAO Cheng-Jui 🇹🇼 - 🇷🇴 Eduard IONESCU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T190000Z
-DTSTART:20240729T190000Z
-DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇺🇸 Lily ZHANG
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-FRA-IND
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
@@ -11174,6 +11164,15 @@ SUMMARY:🏓 Prithika PAVADE 🇫🇷 - 🇮🇳 Manika BATRA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-USA-BRA
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T190000Z-volleyball-WOMENS-PRELIMINARY-ROUND-POOL-A-FRA-SRB
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
@@ -11350,12 +11349,12 @@ SUMMARY:🏄 Men's Round 3 - Heat 6
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-CRO
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇭🇷 Tomislav PUCAR
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/BRA.ics b/docs/table-tennis/BRA.ics
index ca6356340..26dff36b9 100644
--- a/docs/table-tennis/BRA.ics
+++ b/docs/table-tennis/BRA.ics
@@ -49,6 +49,15 @@ SUMMARY:🏓 Nicholas LUM 🇦🇺 - 🇧🇷 Vitor ISHIY
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-USA-BRA
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240805T130000Z-table-tennis-MENS-TEAM-ROUND-OF-16-POR-BRA
 DTSTAMP:20240805T130000Z
 DTSTART:20240805T130000Z
diff --git a/docs/table-tennis/CRO.ics b/docs/table-tennis/CRO.ics
index b90369527..a61052ec8 100644
--- a/docs/table-tennis/CRO.ics
+++ b/docs/table-tennis/CRO.ics
@@ -31,12 +31,12 @@ SUMMARY:🏓 Ovidiu IONESCU 🇷🇴 - 🇭🇷 Andrej GACINA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-CRO
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇭🇷 Tomislav PUCAR
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/CZE.ics b/docs/table-tennis/CZE.ics
index c9645a7bf..1173bd8c7 100644
--- a/docs/table-tennis/CZE.ics
+++ b/docs/table-tennis/CZE.ics
@@ -12,4 +12,13 @@ DESCRIPTION:Table Tennis - Women's Singles Round of 64
 SUMMARY:🏓 Xiaoxin YANG 🇲🇨 - 🇨🇿 Hana MATELOVA
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CZE-NED
+DTSTAMP:20240729T180000Z
+DTSTART:20240729T180000Z
+DTEND:20240729T190000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Hana MATELOVA 🇨🇿 - 🇳🇱 Britt EERLAND
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/FRA.ics b/docs/table-tennis/FRA.ics
index 4131baf99..3c43646c6 100644
--- a/docs/table-tennis/FRA.ics
+++ b/docs/table-tennis/FRA.ics
@@ -67,6 +67,15 @@ SUMMARY:🏓 Prithika PAVADE 🇫🇷 - 🇮🇳 Manika BATRA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-CRO
+DTSTAMP:20240729T200000Z
+DTSTART:20240729T200000Z
+DTEND:20240729T210000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240805T130000Z-table-tennis-WOMENS-TEAM-ROUND-OF-16-FRA-THA
 DTSTAMP:20240805T130000Z
 DTSTART:20240805T130000Z
diff --git a/docs/table-tennis/GER.ics b/docs/table-tennis/GER.ics
index e6ad118d4..16564d904 100644
--- a/docs/table-tennis/GER.ics
+++ b/docs/table-tennis/GER.ics
@@ -49,6 +49,15 @@ SUMMARY:🏓 Minhyung JEE 🇦🇺 - 🇩🇪 Nina MITTELHAM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KAZ-GER
+DTSTAMP:20240729T180000Z
+DTSTART:20240729T180000Z
+DTEND:20240729T190000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Kirill GERASSIMENKO 🇰🇿 - 🇩🇪 Dang QIU
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240805T080000Z-table-tennis-WOMENS-TEAM-ROUND-OF-16-USA-GER
 DTSTAMP:20240805T080000Z
 DTSTART:20240805T080000Z
diff --git a/docs/table-tennis/KAZ.ics b/docs/table-tennis/KAZ.ics
index 12abe3d01..17b353eb1 100644
--- a/docs/table-tennis/KAZ.ics
+++ b/docs/table-tennis/KAZ.ics
@@ -13,13 +13,12 @@ SUMMARY:🏓 Kirill GERASSIMENKO 🇰🇿 - 🇨🇱 Nicolas BURGOS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KAZ-GER
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
 DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇰🇿 Kirill
-  GERASSIMENKO
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Kirill GERASSIMENKO 🇰🇿 - 🇩🇪 Dang QIU
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/NED.ics b/docs/table-tennis/NED.ics
index e135ba4c9..0b1a6022b 100644
--- a/docs/table-tennis/NED.ics
+++ b/docs/table-tennis/NED.ics
@@ -13,12 +13,12 @@ SUMMARY:🏓 Britt EERLAND 🇳🇱 - 🇪🇬 Hana GODA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CZE-NED
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
 DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇳🇱 Britt EERLAND
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Hana MATELOVA 🇨🇿 - 🇳🇱 Britt EERLAND
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/USA.ics b/docs/table-tennis/USA.ics
index 3c2bce132..b38f6f8c9 100644
--- a/docs/table-tennis/USA.ics
+++ b/docs/table-tennis/USA.ics
@@ -40,12 +40,12 @@ SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇱🇧 Mariana SAHAKIAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-USA-BRA
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇺🇸 Lily ZHANG
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/general.ics b/docs/table-tennis/general.ics
index 12ee1d76b..1d3bf1718 100644
--- a/docs/table-tennis/general.ics
+++ b/docs/table-tennis/general.ics
@@ -760,16 +760,6 @@ SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇰🇿 Kirill
-  GERASSIMENKO
-SUMMARY:🏓 Men's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-SWE
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
@@ -779,12 +769,21 @@ SUMMARY:🏓 Felix LEBRUN 🇫🇷 - 🇸🇪 Anton KALLBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T180000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KAZ-GER
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
 DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇳🇱 Britt EERLAND
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Kirill GERASSIMENKO 🇰🇿 - 🇩🇪 Dang QIU
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CZE-NED
+DTSTAMP:20240729T180000Z
+DTSTART:20240729T180000Z
+DTEND:20240729T190000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Hana MATELOVA 🇨🇿 - 🇳🇱 Britt EERLAND
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -815,15 +814,6 @@ SUMMARY:🏓 KAO Cheng-Jui 🇹🇼 - 🇷🇴 Eduard IONESCU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T190000Z
-DTSTART:20240729T190000Z
-DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇺🇸 Lily ZHANG
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-FRA-IND
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
@@ -833,12 +823,21 @@ SUMMARY:🏓 Prithika PAVADE 🇫🇷 - 🇮🇳 Manika BATRA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-USA-BRA
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-FRA-CRO
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇭🇷 Tomislav PUCAR
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/tennis/GER.ics b/docs/tennis/GER.ics
index d6cec95c4..81595e2fa 100644
--- a/docs/tennis/GER.ics
+++ b/docs/tennis/GER.ics
@@ -94,6 +94,15 @@ SUMMARY:🎾 KOEPFER/STRUFF 🇩🇪 - 🇭🇷 MEKTIC/PAVIC
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-GER-ITA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Men's Singles Second Round
+SUMMARY:🎾 Dominik KOEPFER 🇩🇪 - 🇮🇹 Matteo ARNALDI
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-MIXED-DOUBLES-FIRST-ROUND-GER-CZE
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/tennis/ITA.ics b/docs/tennis/ITA.ics
index 867ffb3e8..7d818e4ae 100644
--- a/docs/tennis/ITA.ics
+++ b/docs/tennis/ITA.ics
@@ -104,12 +104,12 @@ SUMMARY:🎾 DARDERI/MUSETTI 🇮🇹 - 🇨🇱 JARRY/TABILO
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND
+UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-GER-ITA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
 DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Men's Singles Second Round\n🇮🇹 Matteo ARNALDI
-SUMMARY:🎾 Men's Singles Second Round
+DESCRIPTION:Tennis - Men's Singles Second Round
+SUMMARY:🎾 Dominik KOEPFER 🇩🇪 - 🇮🇹 Matteo ARNALDI
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/tennis/general.ics b/docs/tennis/general.ics
index 9d14935ea..117010216 100644
--- a/docs/tennis/general.ics
+++ b/docs/tennis/general.ics
@@ -791,15 +791,6 @@ BEGIN:VEVENT
 UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
-DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Men's Singles Second Round\n🇮🇹 Matteo ARNALDI
-SUMMARY:🎾 Men's Singles Second Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
 DTEND:20240729T130000Z
 DESCRIPTION:Tennis - Men's Singles Second Round\n🇦🇷 Tomas Martin
   ETCHEVERRY
@@ -834,6 +825,15 @@ SUMMARY:🎾 Daniel EVANS 🇬🇧 - 🇬🇷 Stefanos TSITSIPAS
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-GER-ITA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Men's Singles Second Round
+SUMMARY:🎾 Dominik KOEPFER 🇩🇪 - 🇮🇹 Matteo ARNALDI
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-MENS-SINGLES-SECOND-ROUND-NOR-ITA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/today.html b/docs/today.html
index d8ea3c718..5b9b441d4 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -12630,19 +12630,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T100000Z" data-end="20240729T143000Z" data-noc="ITA">
- <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
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Singles Second Round
-<div class="competitor ITA">🇮🇹 Matteo ARNALDI</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T100000Z" data-end="20240729T130000Z" data-noc="ARG">
  <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">
@@ -12692,6 +12679,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T100000Z" data-end="20240729T143000Z" data-noc="GER,ITA">
+ <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
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Dominik KOEPFER 🇩🇪 - 🇮🇹 Matteo ARNALDI
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T100000Z" data-end="20240729T143000Z" data-noc="NOR,ITA">
  <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">
@@ -15333,19 +15332,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="KAZ">
- <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">
-   
-   TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Singles Round of 32
-<div class="competitor KAZ">🇰🇿 Kirill GERASSIMENKO</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="FRA,SWE">
  <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">
@@ -15358,7 +15344,19 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="NED">
+<div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="KAZ,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">
+   <div class="text-2xl">
+   
+   TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Kirill GERASSIMENKO 🇰🇿 - 🇩🇪 Dang QIU
+   </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="CZE,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">
@@ -15366,8 +15364,7 @@
    TABLE TENNIS
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Singles Round of 32
-<div class="competitor NED">🇳🇱 Britt EERLAND</div>
+   <div class="">Hana MATELOVA 🇨🇿 - 🇳🇱 Britt EERLAND
    </div>
  </div>
 </div>
@@ -15654,19 +15651,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T190000Z" data-end="20240729T200000Z" data-noc="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">
-   
-   TABLE TENNIS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Singles Round of 32
-<div class="competitor USA">🇺🇸 Lily ZHANG</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T190000Z" data-end="20240729T200000Z" data-noc="FRA,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">
@@ -15679,6 +15663,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T190000Z" data-end="20240729T200000Z" data-noc="USA,BRA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   TABLE TENNIS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Lily ZHANG 🇺🇸 - 🇧🇷 Bruna TAKAHASHI
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T190000Z" data-end="20240729T211500Z" data-noc="FRA,SRB">
  <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">
@@ -15922,7 +15918,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="CRO">
+<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="FRA,CRO">
  <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">
@@ -15930,8 +15926,7 @@
    TABLE TENNIS
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Singles Round of 32
-<div class="competitor CRO">🇭🇷 Tomislav PUCAR</div>
+   <div class="">Alexis LEBRUN 🇫🇷 - 🇭🇷 Tomislav PUCAR
    </div>
  </div>
 </div>