diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index b25bae4c3..ce581a55a 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -15839,51 +15839,6 @@ SUMMARY: DE GROOT/VAN KOOT 🇳🇱 - 🇨🇳 LI/ZHU
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-MENS-DOUBLES-QUARTER-FINALS
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Men's Doubles Quarter-finals
-SUMMARY:Men's Doubles Quarter-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-ORDER-OF-PLAY-AVAILABLE-EVENING-BEFO
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Order of play available evening before
-SUMMARY:Order of play available evening before
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-QUAD-SINGLES-SEMI-FINAL
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Quad Singles Semi-final
-SUMMARY:Quad Singles Semi-final
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-WOMENS-DOUBLES-SEMI-FINALS
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Women's Doubles Semi-finals
-SUMMARY:Women's Doubles Semi-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-WOMENS-SINGLES-QUARTER-FINALS
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles Quarter-finals
-SUMMARY:Women's Singles Quarter-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T100400Z-para-athletics-MENS-400M-T36-FINAL
 DTSTAMP:20240903T100400Z
 DTSTART:20240903T100400Z
@@ -16115,24 +16070,6 @@ SUMMARY: Zsofia ARLOY 🇭🇺 - 🇩🇪 Juliane WOLF
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T110000Z-wheelchair-tennis-QUAD-SINGLES-SEMI-FINAL
-DTSTAMP:20240903T110000Z
-DTSTART:20240903T110000Z
-DTEND:20240903T210000Z
-DESCRIPTION:Wheelchair Tennis - Quad Singles Semi-final
-SUMMARY:Quad Singles Semi-final
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T110000Z-wheelchair-tennis-WOMENS-SINGLES-QUARTER-FINALS
-DTSTAMP:20240903T110000Z
-DTSTART:20240903T110000Z
-DTEND:20240903T210000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles Quarter-finals
-SUMMARY:Women's Singles Quarter-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T113000Z-wheelchair-fencing-MENS-SABRE-CATEGORY-B-TABLE-OF-16-U
 DTSTAMP:20240903T113000Z
 DTSTART:20240903T113000Z
diff --git a/docs/en/wheelchair-tennis/general.ics b/docs/en/wheelchair-tennis/general.ics
index 99d517b71..021a0dcbc 100644
--- a/docs/en/wheelchair-tennis/general.ics
+++ b/docs/en/wheelchair-tennis/general.ics
@@ -1003,69 +1003,6 @@ SUMMARY: DE GROOT/VAN KOOT 🇳🇱 - 🇨🇳 LI/ZHU
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-MENS-DOUBLES-QUARTER-FINALS
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Men's Doubles Quarter-finals
-SUMMARY:Men's Doubles Quarter-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-ORDER-OF-PLAY-AVAILABLE-EVENING-BEFO
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Order of play available evening before
-SUMMARY:Order of play available evening before
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-QUAD-SINGLES-SEMI-FINAL
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Quad Singles Semi-final
-SUMMARY:Quad Singles Semi-final
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-WOMENS-DOUBLES-SEMI-FINALS
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Women's Doubles Semi-finals
-SUMMARY:Women's Doubles Semi-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T100000Z-wheelchair-tennis-WOMENS-SINGLES-QUARTER-FINALS
-DTSTAMP:20240903T100000Z
-DTSTART:20240903T100000Z
-DTEND:20240903T200000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles Quarter-finals
-SUMMARY:Women's Singles Quarter-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T110000Z-wheelchair-tennis-QUAD-SINGLES-SEMI-FINAL
-DTSTAMP:20240903T110000Z
-DTSTART:20240903T110000Z
-DTEND:20240903T210000Z
-DESCRIPTION:Wheelchair Tennis - Quad Singles Semi-final
-SUMMARY:Quad Singles Semi-final
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240903T110000Z-wheelchair-tennis-WOMENS-SINGLES-QUARTER-FINALS
-DTSTAMP:20240903T110000Z
-DTSTART:20240903T110000Z
-DTEND:20240903T210000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles Quarter-finals
-SUMMARY:Women's Singles Quarter-finals
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240904T100000Z-wheelchair-tennis-QUAD-DOUBLES-BRONZE-MEDAL-MATCH-RSA-
 DTSTAMP:20240904T100000Z
 DTSTART:20240904T100000Z
diff --git a/docs/medals.html b/docs/medals.html
index e8746f293..86ffa12e1 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -1471,101 +1471,23 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇳🇱 Netherlands</span>
-    <span class="inline-block text-center w-1/6 flex-none">7</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">4</span>
-    <span class="inline-block text-center w-1/6 flex-none">13</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Nico van der BURGT</td>
-      <td>Para Triathlon - Men's PTS3</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Jetze PLAT</td>
-      <td>Para Triathlon - Men's PTWC</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Geert SCHIPPER</td>
-      <td>Para Triathlon - Men's PTWC</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Joel de JONG</td>
-      <td>Para Athletics - Men's Long Jump - T63 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Noah MBUYAMBA</td>
-      <td>Para Athletics - Men's Long Jump - T63 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Fleur JONG</td>
-      <td>Para Athletics - Women's Long Jump - T64 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Marlene van GANSEWINKEL</td>
-      <td>Para Athletics - Women's Long Jump - T64 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Chantalle ZIJDERVELD</td>
-      <td>Para Swimming - Women's 100m Breaststroke - SB9 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Lisa KRUGER</td>
-      <td>Para Swimming - Women's 100m Breaststroke - SB9 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Liesette BRUINSMA</td>
-      <td>Para Swimming - Women's 400m Freestyle - S11 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Rogier DORSMAN</td>
-      <td>Para Swimming - Men's 400m Freestyle - S11 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Tristan BANGMA</td>
-      <td>Para Cycling Track - Men's B 4000m Individual Pursuit Final - Gold</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Caroline GROOT</td>
-      <td>Para Cycling Track - Women's C4-5 500m Time Trial - Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇮🇹 Italy</span>
-    <span class="inline-block text-center w-1/6 flex-none">6</span>
+    <span class="inline-block text-center w-1/6 flex-none">7</span>
     <span class="inline-block text-center w-1/6 flex-none">6</span>
     <span class="inline-block text-center w-1/6 flex-none">11</span>
-    <span class="inline-block text-center w-1/6 flex-none">23</span>
+    <span class="inline-block text-center w-1/6 flex-none">24</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Simone BARLAAM</td>
+      <td>Para Swimming - Men's 50m Freestyle - S9 Final</td>
+    </tr>
     <tr>
       <td class="bronze">&#9679;</td>
       <td>Giulia TERZI</td>
@@ -1688,6 +1610,89 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇳🇱 Netherlands</span>
+    <span class="inline-block text-center w-1/6 flex-none">7</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</span>
+    <span class="inline-block text-center w-1/6 flex-none">13</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Nico van der BURGT</td>
+      <td>Para Triathlon - Men's PTS3</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Jetze PLAT</td>
+      <td>Para Triathlon - Men's PTWC</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Geert SCHIPPER</td>
+      <td>Para Triathlon - Men's PTWC</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Joel de JONG</td>
+      <td>Para Athletics - Men's Long Jump - T63 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Noah MBUYAMBA</td>
+      <td>Para Athletics - Men's Long Jump - T63 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Fleur JONG</td>
+      <td>Para Athletics - Women's Long Jump - T64 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Marlene van GANSEWINKEL</td>
+      <td>Para Athletics - Women's Long Jump - T64 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Chantalle ZIJDERVELD</td>
+      <td>Para Swimming - Women's 100m Breaststroke - SB9 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Lisa KRUGER</td>
+      <td>Para Swimming - Women's 100m Breaststroke - SB9 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Liesette BRUINSMA</td>
+      <td>Para Swimming - Women's 400m Freestyle - S11 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Rogier DORSMAN</td>
+      <td>Para Swimming - Men's 400m Freestyle - S11 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Tristan BANGMA</td>
+      <td>Para Cycling Track - Men's B 4000m Individual Pursuit Final - Gold</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Caroline GROOT</td>
+      <td>Para Cycling Track - Women's C4-5 500m Time Trial - Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -1890,71 +1895,28 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇨🇭 Switzerland</span>
-    <span class="inline-block text-center w-1/6 flex-none">4</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">7</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Ilaria RENGGLI</td>
-      <td>Para Badminton - Women's Singles WH2 Bronze Medal Match</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Leo McCREA</td>
-      <td>Para Swimming - Men's 100m Breaststroke - SB5 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Manuela SCHAER</td>
-      <td>Para Athletics - Women's 800m - T54 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Catherine DEBRUNNER</td>
-      <td>Para Athletics - Women's 800m - T53 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Marcel HUG</td>
-      <td>Para Athletics - Men's 5000m - T54 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Catherine DEBRUNNER</td>
-      <td>Para Athletics - Women's 5000m - T54 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Flurina RIGLING</td>
-      <td>Para Cycling Track - Women's C1-3 3000m Individual Pursuit Final - Bronze</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇺🇦 Ukraine</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</span>
     <span class="inline-block text-center w-1/6 flex-none">11</span>
-    <span class="inline-block text-center w-1/6 flex-none">14</span>
-    <span class="inline-block text-center w-1/6 flex-none">28</span>
+    <span class="inline-block text-center w-1/6 flex-none">15</span>
+    <span class="inline-block text-center w-1/6 flex-none">30</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Denys OSTAPCHENKO</td>
+      <td>Para Swimming - Men's 50m Backstroke - S3 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Serhii PALAMARCHUK</td>
+      <td>Para Swimming - Men's 50m Backstroke - S3 Final</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Andrii TRUSOV</td>
@@ -2102,6 +2064,59 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇨🇭 Switzerland</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">7</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Ilaria RENGGLI</td>
+      <td>Para Badminton - Women's Singles WH2 Bronze Medal Match</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Leo McCREA</td>
+      <td>Para Swimming - Men's 100m Breaststroke - SB5 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Manuela SCHAER</td>
+      <td>Para Athletics - Women's 800m - T54 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Catherine DEBRUNNER</td>
+      <td>Para Athletics - Women's 800m - T53 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Marcel HUG</td>
+      <td>Para Athletics - Men's 5000m - T54 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Catherine DEBRUNNER</td>
+      <td>Para Athletics - Women's 5000m - T54 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Flurina RIGLING</td>
+      <td>Para Cycling Track - Women's C1-3 3000m Individual Pursuit Final - Bronze</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -2644,13 +2659,18 @@
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇩🇪 Germany</span>
     <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">4</span>
+    <span class="inline-block text-center w-1/6 flex-none">5</span>
     <span class="inline-block text-center w-1/6 flex-none">8</span>
-    <span class="inline-block text-center w-1/6 flex-none">14</span>
+    <span class="inline-block text-center w-1/6 flex-none">15</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Josia Tim Alexander TOPF</td>
+      <td>Para Swimming - Men's 50m Backstroke - S3 Final</td>
+    </tr>
     <tr>
       <td class="bronze">&#9679;</td>
       <td>Anja RENNER</td>
@@ -3003,13 +3023,18 @@
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇮🇩 Indonesia</span>
     <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">5</span>
+    <span class="inline-block text-center w-1/6 flex-none">6</span>
     <span class="inline-block text-center w-1/6 flex-none">3</span>
-    <span class="inline-block text-center w-1/6 flex-none">9</span>
+    <span class="inline-block text-center w-1/6 flex-none">10</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Suryo NUGROHO</td>
+      <td>Para Badminton - Men's Singles SU5 Gold Medal Match</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Leani Ratri OKTILA</td>
@@ -3450,6 +3475,32 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Liek Hou CHEAH</td>
+      <td>Para Badminton - Men's Singles SU5 Gold Medal Match</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Eddy BERNARD</td>
+      <td>Para Athletics - Men's 100m - T44 Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -3741,12 +3792,17 @@
     <span class="inline-block flex-auto">🇳🇴 Norway</span>
     <span class="inline-block text-center w-1/6 flex-none">0</span>
     <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">4</span>
+    <span class="inline-block text-center w-1/6 flex-none">3</span>
+    <span class="inline-block text-center w-1/6 flex-none">5</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-02</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Fredrik SOLBERG</td>
+      <td>Para Swimming - Men's 50m Freestyle - S9 Final</td>
+    </tr>
     <tr>
       <td class="bronze">&#9679;</td>
       <td>Helle Sofie SAGOEY</td>
@@ -4067,26 +4123,6 @@
   </table>
   </div>
 </div>
-<div class="collapse collapse-arrow bg-gray-100 mb-1">
-  <input type="radio" name="accordion">
-  <div class="flex collapse-title text-xl font-medium">
-    <span class="inline-block flex-auto">🇲🇾 Malaysia</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Eddy BERNARD</td>
-      <td>Para Athletics - Men's 100m - T44 Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
diff --git a/docs/today.html b/docs/today.html
index 68535ea70..d634b7fcf 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -34555,71 +34555,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240903T100000Z" data-end="20240903T200000Z" 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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Men's Doubles Quarter-finals</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240903T100000Z" data-end="20240903T200000Z" 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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Order of play available evening before</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240903T100000Z" data-end="20240903T200000Z" 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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Quad Singles Semi-final</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240903T100000Z" data-end="20240903T200000Z" 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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Women's Doubles Semi-finals</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240903T100000Z" data-end="20240903T200000Z" 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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Women's Singles Quarter-finals</div>
- </div>
-</div>
 <div class="event py-4 bg-amber-400" data-start="20240903T100400Z" data-end="20240903T101100Z" data-noc="ALG,ARG,AUS,JPN,NZL,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">
   <span class="time-start">__:__</span>
@@ -35096,32 +35031,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240903T110000Z" data-end="20240903T210000Z" 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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Quad Singles Semi-final</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240903T110000Z" data-end="20240903T210000Z" 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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Women's Singles Quarter-finals</div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240903T113000Z" data-end="20240903T115000Z" data-noc="GBR,UKR" >
  <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">
   <span class="time-start">__:__</span>