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/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 22644aad4..e6494097e 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -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/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/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 69f3e1256..6aac023eb 100644
--- a/docs/table-tennis/general.ics
+++ b/docs/table-tennis/general.ics
@@ -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 e4b4aa506..6b7f774c8 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -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">