diff --git a/docs/general/GBR.ics b/docs/general/GBR.ics
index afefe5b7a..6b3189a6a 100644
--- a/docs/general/GBR.ics
+++ b/docs/general/GBR.ics
@@ -1658,15 +1658,6 @@ SUMMARY:🔫 50m Rifle 3 Positions Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-GBR
-DTSTAMP:20240731T080000Z
-DTSTART:20240731T080000Z
-DTEND:20240731T090000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇬🇧 Liam PITCHFORD
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T083000Z-hockey-WOMENS-POOL-B-RSA-GBR
 DTSTAMP:20240731T083000Z
 DTSTART:20240731T083000Z
diff --git a/docs/general/GRE.ics b/docs/general/GRE.ics
index f58f1f080..6bd437d12 100644
--- a/docs/general/GRE.ics
+++ b/docs/general/GRE.ics
@@ -355,15 +355,6 @@ SUMMARY:🚣 Lightweight Women's Double Sculls Semifinal A/B 2
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-USA-GRE
-DTSTAMP:20240731T100000Z
-DTSTART:20240731T100000Z
-DTEND:20240731T110000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T120300Z-sailing-MENS-WINDSURFING-RACE-7
 DTSTAMP:20240731T120300Z
 DTSTART:20240731T120300Z
diff --git a/docs/general/IRI.ics b/docs/general/IRI.ics
index a51ecde85..b1ddb55af 100644
--- a/docs/general/IRI.ics
+++ b/docs/general/IRI.ics
@@ -201,12 +201,12 @@ SUMMARY:🚣 Lightweight Women's Double Sculls Final C
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-JPN-IRI
+UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T100000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Tomokazu HARIMOTO 🇯🇵 - 🇮🇷 Noshad ALAMIYAN
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇮🇷 Noshad ALAMIYAN
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index f9d677ef1..8e190b051 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -2089,15 +2089,6 @@ SUMMARY:🏸 ASTRUP/RASMUSSEN 🇩🇰 - 🇯🇵 HOKI/KOBAYASHI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-JPN-IRI
-DTSTAMP:20240731T090000Z
-DTSTART:20240731T090000Z
-DTEND:20240731T100000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Tomokazu HARIMOTO 🇯🇵 - 🇮🇷 Noshad ALAMIYAN
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T090600Z-judo-WOMEN-70-KG-ELIMINATION-ROUND-OF-16
 DTSTAMP:20240731T090600Z
 DTSTART:20240731T090600Z
diff --git a/docs/general/SLO.ics b/docs/general/SLO.ics
index e0aec7cd9..b69e39860 100644
--- a/docs/general/SLO.ics
+++ b/docs/general/SLO.ics
@@ -562,12 +562,12 @@ SUMMARY:🛶 Men's Kayak Single Heats 2nd Run
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-GBR
+UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T080000Z
 DTSTART:20240731T080000Z
 DTEND:20240731T090000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇬🇧 Liam PITCHFORD
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇸🇮 Darko JORGIC
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 82a675746..ba00306f9 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -2706,12 +2706,12 @@ SUMMARY:🥊 Omari JONES 🇺🇸 - 🇹🇼 KAN Chia Wei
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-USA-GRE
+UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T100000Z
 DTSTART:20240731T100000Z
 DTEND:20240731T110000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇺🇸 Kanak JHA
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 480441149..ca0ff9847 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -14678,6 +14678,15 @@ SUMMARY:🥋 Kim POLLING 🇮🇹 - 🇵🇹 Tais PINA
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+DTSTAMP:20240731T080000Z
+DTSTART:20240731T080000Z
+DTEND:20240731T090000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇸🇮 Darko JORGIC
+SUMMARY:🏓 Men's Singles Round of 32
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-CHN-SWE
 DTSTAMP:20240731T080000Z
 DTSTART:20240731T080000Z
@@ -14687,15 +14696,6 @@ SUMMARY:🏓 WANG Chuqin 🇨🇳 - 🇸🇪 Truls MOREGARD
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-GBR
-DTSTAMP:20240731T080000Z
-DTSTART:20240731T080000Z
-DTEND:20240731T090000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇬🇧 Liam PITCHFORD
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T080000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-HKG-JPN
 DTSTAMP:20240731T080000Z
 DTSTART:20240731T080000Z
@@ -15063,12 +15063,12 @@ SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-JPN-IRI
+UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T100000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Tomokazu HARIMOTO 🇯🇵 - 🇮🇷 Noshad ALAMIYAN
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇮🇷 Noshad ALAMIYAN
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -15378,6 +15378,15 @@ SUMMARY:🥋 Men -90 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+DTSTAMP:20240731T100000Z
+DTSTART:20240731T100000Z
+DTEND:20240731T110000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇺🇸 Kanak JHA
+SUMMARY:🏓 Men's Singles Round of 32
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-HKG-CHN
 DTSTAMP:20240731T100000Z
 DTSTART:20240731T100000Z
@@ -15387,15 +15396,6 @@ SUMMARY:🏓 WONG Chun Ting 🇭🇰 - 🇨🇳 FAN Zhendong
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-USA-GRE
-DTSTAMP:20240731T100000Z
-DTSTART:20240731T100000Z
-DTEND:20240731T110000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T100000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-EGY-JPN
 DTSTAMP:20240731T100000Z
 DTSTART:20240731T100000Z
diff --git a/docs/table-tennis/GBR.ics b/docs/table-tennis/GBR.ics
index 9fcf35043..f62a01673 100644
--- a/docs/table-tennis/GBR.ics
+++ b/docs/table-tennis/GBR.ics
@@ -21,13 +21,4 @@ DESCRIPTION:Table Tennis - Men's Singles Round of 64
 SUMMARY:🏓 Vicky WU 🇫🇯 - 🇬🇧 Liam PITCHFORD
 LOCATION:South Paris Arena 4
 END:VEVENT
-BEGIN:VEVENT
-UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-GBR
-DTSTAMP:20240731T080000Z
-DTSTART:20240731T080000Z
-DTEND:20240731T090000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇬🇧 Liam PITCHFORD
-LOCATION:South Paris Arena 4
-END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/GRE.ics b/docs/table-tennis/GRE.ics
index c72edd81d..86e4a1b76 100644
--- a/docs/table-tennis/GRE.ics
+++ b/docs/table-tennis/GRE.ics
@@ -12,13 +12,4 @@ DESCRIPTION:Table Tennis - Men's Singles Round of 64
 SUMMARY:🏓 Panagiotis GIONIS 🇬🇷 - 🇨🇦 Edward LY
 LOCATION:South Paris Arena 4
 END:VEVENT
-BEGIN:VEVENT
-UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-USA-GRE
-DTSTAMP:20240731T100000Z
-DTSTART:20240731T100000Z
-DTEND:20240731T110000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
-LOCATION:South Paris Arena 4
-END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/IRI.ics b/docs/table-tennis/IRI.ics
index 9e69eb66f..70f18237c 100644
--- a/docs/table-tennis/IRI.ics
+++ b/docs/table-tennis/IRI.ics
@@ -31,12 +31,12 @@ SUMMARY:🏓 KAO Cheng-Jui 🇹🇼 - 🇮🇷 Nima ALAMIAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-JPN-IRI
+UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T100000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Tomokazu HARIMOTO 🇯🇵 - 🇮🇷 Noshad ALAMIYAN
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇮🇷 Noshad ALAMIYAN
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/JPN.ics b/docs/table-tennis/JPN.ics
index ad76de16e..7d60b95ea 100644
--- a/docs/table-tennis/JPN.ics
+++ b/docs/table-tennis/JPN.ics
@@ -67,15 +67,6 @@ SUMMARY:🏓 ZHU Chengzhu 🇭🇰 - 🇯🇵 Miu HIRANO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-JPN-IRI
-DTSTAMP:20240731T090000Z
-DTSTART:20240731T090000Z
-DTEND:20240731T100000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Tomokazu HARIMOTO 🇯🇵 - 🇮🇷 Noshad ALAMIYAN
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T100000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-EGY-JPN
 DTSTAMP:20240731T100000Z
 DTSTART:20240731T100000Z
diff --git a/docs/table-tennis/SLO.ics b/docs/table-tennis/SLO.ics
index 42be41036..0be071810 100644
--- a/docs/table-tennis/SLO.ics
+++ b/docs/table-tennis/SLO.ics
@@ -31,12 +31,12 @@ SUMMARY:🏓 Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-GBR
+UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T080000Z
 DTSTART:20240731T080000Z
 DTEND:20240731T090000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇬🇧 Liam PITCHFORD
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇸🇮 Darko JORGIC
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/USA.ics b/docs/table-tennis/USA.ics
index 12a11c976..0f904d4f6 100644
--- a/docs/table-tennis/USA.ics
+++ b/docs/table-tennis/USA.ics
@@ -58,12 +58,12 @@ SUMMARY:🏓 Adriana DIAZ 🇵🇷 - 🇺🇸 Amy WANG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-USA-GRE
+UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T100000Z
 DTSTART:20240731T100000Z
 DTEND:20240731T110000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇺🇸 Kanak JHA
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/general.ics b/docs/table-tennis/general.ics
index 8264a68d8..6aac023eb 100644
--- a/docs/table-tennis/general.ics
+++ b/docs/table-tennis/general.ics
@@ -958,6 +958,15 @@ SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇵 RI/KIM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+DTSTAMP:20240731T080000Z
+DTSTART:20240731T080000Z
+DTEND:20240731T090000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇸🇮 Darko JORGIC
+SUMMARY:🏓 Men's Singles Round of 32
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-CHN-SWE
 DTSTAMP:20240731T080000Z
 DTSTART:20240731T080000Z
@@ -967,15 +976,6 @@ SUMMARY:🏓 WANG Chuqin 🇨🇳 - 🇸🇪 Truls MOREGARD
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-GBR
-DTSTAMP:20240731T080000Z
-DTSTART:20240731T080000Z
-DTEND:20240731T090000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇬🇧 Liam PITCHFORD
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T080000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-HKG-JPN
 DTSTAMP:20240731T080000Z
 DTSTART:20240731T080000Z
@@ -1003,12 +1003,12 @@ SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-JPN-IRI
+UID:20240731T090000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T090000Z
 DTSTART:20240731T090000Z
 DTEND:20240731T100000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Tomokazu HARIMOTO 🇯🇵 - 🇮🇷 Noshad ALAMIYAN
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇮🇷 Noshad ALAMIYAN
+SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -1030,6 +1030,15 @@ SUMMARY:🏓 ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+DTSTAMP:20240731T100000Z
+DTSTART:20240731T100000Z
+DTEND:20240731T110000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇺🇸 Kanak JHA
+SUMMARY:🏓 Men's Singles Round of 32
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-HKG-CHN
 DTSTAMP:20240731T100000Z
 DTSTART:20240731T100000Z
@@ -1039,15 +1048,6 @@ SUMMARY:🏓 WONG Chun Ting 🇭🇰 - 🇨🇳 FAN Zhendong
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-USA-GRE
-DTSTAMP:20240731T100000Z
-DTSTART:20240731T100000Z
-DTEND:20240731T110000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T100000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-EGY-JPN
 DTSTAMP:20240731T100000Z
 DTSTART:20240731T100000Z
diff --git a/docs/today.html b/docs/today.html
index 680465780..e95b8df07 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -21970,6 +21970,19 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T080000Z" data-end="20240731T090000Z" data-noc="SLO">
+ <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 SLO"> 🇸🇮 Darko JORGIC </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T080000Z" data-end="20240731T090000Z" data-noc="CHN,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">
@@ -21983,19 +21996,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T080000Z" data-end="20240731T090000Z" data-noc="SLO,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">
-   <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="">Darko JORGIC 🇸🇮 - 🇬🇧 Liam PITCHFORD</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T080000Z" data-end="20240731T090000Z" data-noc="HKG,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">
@@ -22509,7 +22509,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T090000Z" data-end="20240731T100000Z" data-noc="JPN,IRI">
+<div class="event py-4" data-start="20240731T090000Z" data-end="20240731T100000Z" data-noc="IRI">
  <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">
@@ -22518,7 +22518,7 @@
    <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="">Tomokazu HARIMOTO 🇯🇵 - 🇮🇷 Noshad ALAMIYAN</div>
+<div class= "competitor IRI"> 🇮🇷 Noshad ALAMIYAN </div>
    </div>
  </div>
 </div>
@@ -22935,6 +22935,19 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240731T100000Z" data-end="20240731T110000Z" 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-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div class="">Men's Singles Round of 32
+<div class= "competitor USA"> 🇺🇸 Kanak JHA </div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240731T100000Z" data-end="20240731T110000Z" data-noc="HKG,CHN">
  <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">
@@ -22948,19 +22961,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T100000Z" data-end="20240731T110000Z" data-noc="USA,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">
-   <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="">Kanak JHA 🇺🇸 - 🇬🇷 Panagiotis GIONIS</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240731T100000Z" data-end="20240731T110000Z" data-noc="EGY,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">