diff --git a/docs/en/general/AUS.ics b/docs/en/general/AUS.ics
index 27b55daf4..e96e052be 100644
--- a/docs/en/general/AUS.ics
+++ b/docs/en/general/AUS.ics
@@ -1882,13 +1882,12 @@ SUMMARY:Women's 100m Breaststroke - SB14 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3
+UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3-A
 DTSTAMP:20240902T163000Z
 DTSTART:20240902T163000Z
 DTEND:20240902T171500Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  3\n🇦🇺 Melissa TAPPER
-SUMMARY:Women's Singles - WS10 - Quarterfinal 3
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 3
+SUMMARY: Melissa TAPPER 🇦🇺 - 🇹🇼 TIAN Shiau Wen
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/BEL.ics b/docs/en/general/BEL.ics
index 0cc649f36..f3e0e0c7b 100644
--- a/docs/en/general/BEL.ics
+++ b/docs/en/general/BEL.ics
@@ -330,6 +330,15 @@ SUMMARY:Men's 100m Breaststroke - SB14 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-BEL
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇧🇪 Marc LEDOUX
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T182000Z-para-athletics-WOMENS-400M-T20-ROUND-1
 DTSTAMP:20240902T182000Z
 DTSTART:20240902T182000Z
diff --git a/docs/en/general/BRA.ics b/docs/en/general/BRA.ics
index c60e6b85c..003a65afc 100644
--- a/docs/en/general/BRA.ics
+++ b/docs/en/general/BRA.ics
@@ -2570,13 +2570,21 @@ SUMMARY: BRA 🇧🇷 - 🇨🇷 CRC
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1-POL
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1
+SUMMARY: Patryk CHOJNOWSKI 🇵🇱 - 🇧🇷 Claudio MASSAD
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2-S
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  2\n🇧🇷 Bruna ALEXANDRE
-SUMMARY:Women's Singles - WS10 - Quarterfinal 2
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 2
+SUMMARY: Anja HANDEN 🇸🇪 - 🇧🇷 Bruna ALEXANDRE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -2672,6 +2680,15 @@ SUMMARY:Men's 100m - T35 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3-SRB-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3
+SUMMARY: Mitar PALIKUCA 🇷🇸 - 🇧🇷 Lucas ARABIAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T171500Z-para-athletics-MENS-LONG-JUMP-T36-FINAL
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
diff --git a/docs/en/general/CHI.ics b/docs/en/general/CHI.ics
index d3c8f9a47..5b5c0e3bf 100644
--- a/docs/en/general/CHI.ics
+++ b/docs/en/general/CHI.ics
@@ -418,6 +418,15 @@ SUMMARY: Ignacio TORRES 🇨🇱 - 🇫🇷 Esteban HERRAULT
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4-CHI
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4
+SUMMARY: Manuel ECHAVEGUREN 🇨🇱 - 🇲🇪 Filip RADOVIC
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-TUR-CHI
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index 802b7b2db..68a8084e3 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -3952,13 +3952,30 @@ SUMMARY:Women's 100m - T11 Semi-Finals
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4-CHN-
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4
+SUMMARY: CAO Ningning 🇨🇳 - 🇹🇼 CHENG Ming Chih
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-POL
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: PENG Weinan 🇨🇳 - 🇵🇱 Piotr GRUDZIEN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-BEL
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇧🇪 Marc LEDOUX
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/CRO.ics b/docs/en/general/CRO.ics
index b0a046415..3a9966943 100644
--- a/docs/en/general/CRO.ics
+++ b/docs/en/general/CRO.ics
@@ -311,6 +311,15 @@ SUMMARY:Men's PTS4
 LOCATION:Pont Alexandre III
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CRO-SWE
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Borna ZOHIL 🇭🇷 - 🇸🇪 Emil ANDERSSON
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T183500Z-para-athletics-MENS-SHOT-PUT-F11-FINAL
 DTSTAMP:20240902T183500Z
 DTSTART:20240902T183500Z
diff --git a/docs/en/general/FRA.ics b/docs/en/general/FRA.ics
index 74116ba28..283811d66 100644
--- a/docs/en/general/FRA.ics
+++ b/docs/en/general/FRA.ics
@@ -2536,13 +2536,12 @@ SUMMARY: FUNAYAMA Mahiro 🇯🇵 - 🇫🇷 Mateo BOHEAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-KOR
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
 DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇫🇷
-  Florian MERRIEN
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Florian MERRIEN 🇫🇷 - 🇰🇷 BAEK Youngbok
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -2621,6 +2620,15 @@ SUMMARY: FRA 🇫🇷 - 🇬🇧 GBR
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2-FRA-
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2
+SUMMARY: Nicolas SAVANT-AIRA 🇫🇷 - 🇳🇴 Tommy URHAUG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T180000Z-sitting-volleyball-MENS-PRELIMINARY-ROUND-POOL-A-BIH-F
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
diff --git a/docs/en/general/GBR.ics b/docs/en/general/GBR.ics
index 4e37c8f7f..c9f38babf 100644
--- a/docs/en/general/GBR.ics
+++ b/docs/en/general/GBR.ics
@@ -2644,13 +2644,12 @@ SUMMARY:Women's 100m Breaststroke - SB14 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-GBR-THA
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
 DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Billy SHILTON
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Billy SHILTON 🇬🇧 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -2675,13 +2674,12 @@ SUMMARY:Men's 100m - T64 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-SVK-GBR
 DTSTAMP:20240902T184500Z
 DTSTART:20240902T184500Z
 DTEND:20240902T193000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Aaron McKIBBIN
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Richard CSEJTEY 🇸🇰 - 🇬🇧 Aaron McKIBBIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/GER.ics b/docs/en/general/GER.ics
index dc4b7bde1..05935efba 100644
--- a/docs/en/general/GER.ics
+++ b/docs/en/general/GER.ics
@@ -1457,13 +1457,12 @@ SUMMARY:Women's 50m Freestyle - S13 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1-GER-
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
 DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1\n🇩🇪
-  Valentin BAUS
-SUMMARY:Men's Singles - MS5 - Quarterfinal 1
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1
+SUMMARY: Valentin BAUS 🇩🇪 - 🇹🇷 Ali OZTURK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/KOR.ics b/docs/en/general/KOR.ics
index a665b36cd..fe714f05c 100644
--- a/docs/en/general/KOR.ics
+++ b/docs/en/general/KOR.ics
@@ -1433,6 +1433,15 @@ SUMMARY:P3 - Mixed 25m Pistol SH1 Qualification Rapid
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-KOR
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Florian MERRIEN 🇫🇷 - 🇰🇷 BAEK Youngbok
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T152000Z-para-badminton-MENS-SINGLES-WH1-GOLD-MEDAL-MATCH-KOR-C
 DTSTAMP:20240902T152000Z
 DTSTART:20240902T152000Z
diff --git a/docs/en/general/MNE.ics b/docs/en/general/MNE.ics
index 3b4c872df..da9fb618a 100644
--- a/docs/en/general/MNE.ics
+++ b/docs/en/general/MNE.ics
@@ -43,13 +43,12 @@ SUMMARY: Luka BAKIC 🇲🇪 - 🇯🇵 FUNAYAMA Mahiro
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4
+UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4-CHI
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4\n🇲🇪
-  Filip RADOVIC
-SUMMARY:Men's Singles - MS10 - Quarterfinal 4
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4
+SUMMARY: Manuel ECHAVEGUREN 🇨🇱 - 🇲🇪 Filip RADOVIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/NOR.ics b/docs/en/general/NOR.ics
index 53a206563..f967ccf90 100644
--- a/docs/en/general/NOR.ics
+++ b/docs/en/general/NOR.ics
@@ -265,13 +265,12 @@ SUMMARY:Men's 50m Freestyle - S9 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2-FRA-
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2\n🇳🇴
-  Tommy URHAUG
-SUMMARY:Men's Singles - MS5 - Quarterfinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2
+SUMMARY: Nicolas SAVANT-AIRA 🇫🇷 - 🇳🇴 Tommy URHAUG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/POL.ics b/docs/en/general/POL.ics
index cf28ad6ed..0584ea4a0 100644
--- a/docs/en/general/POL.ics
+++ b/docs/en/general/POL.ics
@@ -1031,13 +1031,12 @@ SUMMARY: LIAN Hao 🇨🇳 - 🇵🇱 Igor MISZTAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1-POL
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
 DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1\n🇵🇱
-  Patryk CHOJNOWSKI
-SUMMARY:Men's Singles - MS10 - Quarterfinal 1
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1
+SUMMARY: Patryk CHOJNOWSKI 🇵🇱 - 🇧🇷 Claudio MASSAD
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -1062,13 +1061,12 @@ SUMMARY:Men's 200m Freestyle - S2 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-POL
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇵🇱
-  Piotr GRUDZIEN
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: PENG Weinan 🇨🇳 - 🇵🇱 Piotr GRUDZIEN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/SRB.ics b/docs/en/general/SRB.ics
index ad64136d9..c19002f25 100644
--- a/docs/en/general/SRB.ics
+++ b/docs/en/general/SRB.ics
@@ -394,13 +394,12 @@ SUMMARY:P3 - Mixed 25m Pistol SH1 Qualification Rapid
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3-SRB-
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
 DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3\n🇷🇸
-  Mitar PALIKUCA
-SUMMARY:Men's Singles - MS5 - Quarterfinal 3
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3
+SUMMARY: Mitar PALIKUCA 🇷🇸 - 🇧🇷 Lucas ARABIAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/SVK.ics b/docs/en/general/SVK.ics
index 0ee18c404..c9c38604d 100644
--- a/docs/en/general/SVK.ics
+++ b/docs/en/general/SVK.ics
@@ -537,6 +537,15 @@ SUMMARY: Filip NACHAZEL 🇨🇿 - 🇸🇰 Boris TRAVNICEK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-SVK-GBR
+DTSTAMP:20240902T184500Z
+DTSTART:20240902T184500Z
+DTEND:20240902T193000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Richard CSEJTEY 🇸🇰 - 🇬🇧 Aaron McKIBBIN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T073000Z-shooting-para-sport-R7-MENS-50M-RIFLE-3-POSITIONS-SH1-
 DTSTAMP:20240903T073000Z
 DTSTART:20240903T073000Z
diff --git a/docs/en/general/SWE.ics b/docs/en/general/SWE.ics
index 6febbf922..942f5d4fa 100644
--- a/docs/en/general/SWE.ics
+++ b/docs/en/general/SWE.ics
@@ -297,13 +297,21 @@ SUMMARY:Men's 200m Freestyle - S2 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2-S
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 2
+SUMMARY: Anja HANDEN 🇸🇪 - 🇧🇷 Bruna ALEXANDRE
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CRO-SWE
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇸🇪
-  Emil ANDERSSON
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Borna ZOHIL 🇭🇷 - 🇸🇪 Emil ANDERSSON
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/THA.ics b/docs/en/general/THA.ics
index 9aa724df3..f33b9b866 100644
--- a/docs/en/general/THA.ics
+++ b/docs/en/general/THA.ics
@@ -1463,6 +1463,15 @@ SUMMARY: Wanchai CHAIWUT 🇹🇭 - 🇦🇺 Christopher ADDIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-GBR-THA
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Billy SHILTON 🇬🇧 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T182000Z-para-athletics-WOMENS-400M-T20-ROUND-1
 DTSTAMP:20240902T182000Z
 DTSTART:20240902T182000Z
diff --git a/docs/en/general/TPE.ics b/docs/en/general/TPE.ics
index 1828b4cb4..74f829f68 100644
--- a/docs/en/general/TPE.ics
+++ b/docs/en/general/TPE.ics
@@ -262,13 +262,21 @@ SUMMARY: Qian YANG 🇦🇺 - 🇹🇼 LIN Tzu Yu
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4
+UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3-A
+DTSTAMP:20240902T163000Z
+DTSTART:20240902T163000Z
+DTEND:20240902T171500Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 3
+SUMMARY: Melissa TAPPER 🇦🇺 - 🇹🇼 TIAN Shiau Wen
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4-CHN-
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4\n🇹🇼
-  CHENG Ming Chih
-SUMMARY:Men's Singles - MS5 - Quarterfinal 4
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4
+SUMMARY: CAO Ningning 🇨🇳 - 🇹🇼 CHENG Ming Chih
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/TUR.ics b/docs/en/general/TUR.ics
index 089e9c1c4..1023be509 100644
--- a/docs/en/general/TUR.ics
+++ b/docs/en/general/TUR.ics
@@ -1058,6 +1058,15 @@ SUMMARY: TUR 🇹🇷 - 🇨🇳 CHN
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1-GER-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1
+SUMMARY: Valentin BAUS 🇩🇪 - 🇹🇷 Ali OZTURK
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T182000Z-para-athletics-WOMENS-400M-T20-ROUND-1
 DTSTAMP:20240902T182000Z
 DTSTART:20240902T182000Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 6be563091..e5c76e3ce 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -14098,6 +14098,15 @@ SUMMARY: FUNAYAMA Mahiro 🇯🇵 - 🇫🇷 Mateo BOHEAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-KOR
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Florian MERRIEN 🇫🇷 - 🇰🇷 BAEK Youngbok
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-3-CHN
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
@@ -14107,6 +14116,15 @@ SUMMARY: LIAN Hao 🇨🇳 - 🇵🇱 Igor MISZTAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1-POL
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1
+SUMMARY: Patryk CHOJNOWSKI 🇵🇱 - 🇧🇷 Claudio MASSAD
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-UKR-GER
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
@@ -14125,26 +14143,6 @@ SUMMARY: Wanchai CHAIWUT 🇹🇭 - 🇦🇺 Christopher ADDIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1
-DTSTAMP:20240902T150000Z
-DTSTART:20240902T150000Z
-DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1\n🇵🇱
-  Patryk CHOJNOWSKI
-SUMMARY:Men's Singles - MS10 - Quarterfinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T150000Z
-DTSTART:20240902T150000Z
-DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇫🇷
-  Florian MERRIEN
-SUMMARY:Men's Singles - MS3 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T150000Z-boccia-MENS-INDIVIDUAL-BC4-GOLD-MEDAL-MATCH-COL-GBR
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
@@ -14231,6 +14229,15 @@ SUMMARY:Women's 400m Freestyle - S7 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2-S
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 2
+SUMMARY: Anja HANDEN 🇸🇪 - 🇧🇷 Bruna ALEXANDRE
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-FRA-JPN
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
@@ -14240,6 +14247,15 @@ SUMMARY: Emeric MARTIN 🇫🇷 - 🇯🇵 SHICHINO Kazuki
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4-CHI
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4
+SUMMARY: Manuel ECHAVEGUREN 🇨🇱 - 🇲🇪 Filip RADOVIC
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-TUR-CHI
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
@@ -14267,26 +14283,6 @@ SUMMARY: Qian YANG 🇦🇺 - 🇹🇼 LIN Tzu Yu
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4
-DTSTAMP:20240902T154500Z
-DTSTART:20240902T154500Z
-DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4\n🇲🇪
-  Filip RADOVIC
-SUMMARY:Men's Singles - MS10 - Quarterfinal 4
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2
-DTSTAMP:20240902T154500Z
-DTSTART:20240902T154500Z
-DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  2\n🇧🇷 Bruna ALEXANDRE
-SUMMARY:Women's Singles - WS10 - Quarterfinal 2
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T154500Z-goalball-MENS-QUARTERFINAL-CHN-FRA
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
@@ -14436,6 +14432,15 @@ SUMMARY: Filip NACHAZEL 🇨🇿 - 🇸🇰 Boris TRAVNICEK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3-A
+DTSTAMP:20240902T163000Z
+DTSTART:20240902T163000Z
+DTEND:20240902T171500Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 3
+SUMMARY: Melissa TAPPER 🇦🇺 - 🇹🇼 TIAN Shiau Wen
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-4-T
 DTSTAMP:20240902T163000Z
 DTSTART:20240902T163000Z
@@ -14463,16 +14468,6 @@ SUMMARY: SAITO Genki 🇯🇵 - 🇫🇷 Maxime THOMAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3
-DTSTAMP:20240902T163000Z
-DTSTART:20240902T163000Z
-DTEND:20240902T171500Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  3\n🇦🇺 Melissa TAPPER
-SUMMARY:Women's Singles - WS10 - Quarterfinal 3
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T163000Z-blind-football-MENS-PRELIMINARY-ROUND-GROUP-A-TUR-CHN
 DTSTAMP:20240902T163000Z
 DTSTART:20240902T163000Z
@@ -14570,6 +14565,15 @@ SUMMARY:Men's 100m Breaststroke - SB4 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-GBR-THA
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Billy SHILTON 🇬🇧 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-ESP-KOR
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
@@ -14579,6 +14583,24 @@ SUMMARY: Francisco Javier LOPEZ 🇪🇸 - 🇰🇷 KIM Young-Gun
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3-SRB-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3
+SUMMARY: Mitar PALIKUCA 🇷🇸 - 🇧🇷 Lucas ARABIAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1-GER-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1
+SUMMARY: Valentin BAUS 🇩🇪 - 🇹🇷 Ali OZTURK
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-UKR-FRA
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
@@ -14588,36 +14610,6 @@ SUMMARY: Viktor DIDUKH 🇺🇦 - 🇫🇷 Thomas BOUVAIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1
-DTSTAMP:20240902T171500Z
-DTSTART:20240902T171500Z
-DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1\n🇩🇪
-  Valentin BAUS
-SUMMARY:Men's Singles - MS5 - Quarterfinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3
-DTSTAMP:20240902T171500Z
-DTSTART:20240902T171500Z
-DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3\n🇷🇸
-  Mitar PALIKUCA
-SUMMARY:Men's Singles - MS5 - Quarterfinal 3
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T171500Z
-DTSTART:20240902T171500Z
-DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Billy SHILTON
-SUMMARY:Men's Singles - MS8 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T171500Z-para-table-tennis-WOMENS-SINGLES-WS11-ROUND-OF-16
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
@@ -14735,6 +14727,33 @@ SUMMARY:Men's 100m - T64 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CRO-SWE
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Borna ZOHIL 🇭🇷 - 🇸🇪 Emil ANDERSSON
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4-CHN-
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4
+SUMMARY: CAO Ningning 🇨🇳 - 🇹🇼 CHENG Ming Chih
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2-FRA-
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2
+SUMMARY: Nicolas SAVANT-AIRA 🇫🇷 - 🇳🇴 Tommy URHAUG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T180000Z-para-table-tennis-WOMENS-SINGLES-WS1-2-ROUND-OF-16-EGY
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
@@ -14744,53 +14763,21 @@ SUMMARY: Ola SOLIMAN 🇪🇬 - 🇩🇪 Jana SPEGEL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-POL
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2\n🇳🇴
-  Tommy URHAUG
-SUMMARY:Men's Singles - MS5 - Quarterfinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: PENG Weinan 🇨🇳 - 🇵🇱 Piotr GRUDZIEN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-BEL
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4\n🇹🇼
-  CHENG Ming Chih
-SUMMARY:Men's Singles - MS5 - Quarterfinal 4
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T180000Z
-DTSTART:20240902T180000Z
-DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T180000Z
-DTSTART:20240902T180000Z
-DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇵🇱
-  Piotr GRUDZIEN
-SUMMARY:Men's Singles - MS8 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T180000Z
-DTSTART:20240902T180000Z
-DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇸🇪
-  Emil ANDERSSON
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇧🇪 Marc LEDOUX
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -14942,13 +14929,12 @@ SUMMARY: Maksym NIKOLENKO 🇺🇦 - 🇪🇸 Alejandro DIAZ
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-SVK-GBR
 DTSTAMP:20240902T184500Z
 DTSTART:20240902T184500Z
 DTEND:20240902T193000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Aaron McKIBBIN
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Richard CSEJTEY 🇸🇰 - 🇬🇧 Aaron McKIBBIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/AUS.ics b/docs/en/para-table-tennis/AUS.ics
index 3dc475c77..329a5a81b 100644
--- a/docs/en/para-table-tennis/AUS.ics
+++ b/docs/en/para-table-tennis/AUS.ics
@@ -157,13 +157,12 @@ SUMMARY: Qian YANG 🇦🇺 - 🇹🇼 LIN Tzu Yu
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3
+UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3-A
 DTSTAMP:20240902T163000Z
 DTSTART:20240902T163000Z
 DTEND:20240902T171500Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  3\n🇦🇺 Melissa TAPPER
-SUMMARY:Women's Singles - WS10 - Quarterfinal 3
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 3
+SUMMARY: Melissa TAPPER 🇦🇺 - 🇹🇼 TIAN Shiau Wen
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/BEL.ics b/docs/en/para-table-tennis/BEL.ics
index 635ee8afb..cf572d981 100644
--- a/docs/en/para-table-tennis/BEL.ics
+++ b/docs/en/para-table-tennis/BEL.ics
@@ -40,6 +40,15 @@ SUMMARY: Ben DESPINEUX 🇧🇪 - 🇳🇱 Jean Paul MONTANUS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-BEL
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇧🇪 Marc LEDOUX
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T101500Z-para-table-tennis-MENS-SINGLES-MS9-QUARTERFINAL-1
 DTSTAMP:20240904T101500Z
 DTSTART:20240904T101500Z
diff --git a/docs/en/para-table-tennis/BRA.ics b/docs/en/para-table-tennis/BRA.ics
index b5ce03dc0..2cc841b0e 100644
--- a/docs/en/para-table-tennis/BRA.ics
+++ b/docs/en/para-table-tennis/BRA.ics
@@ -221,13 +221,21 @@ SUMMARY: Thiago GOMES 🇧🇷 - 🇪🇬 Abdelrahman ABDALLA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1-POL
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1
+SUMMARY: Patryk CHOJNOWSKI 🇵🇱 - 🇧🇷 Claudio MASSAD
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2-S
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  2\n🇧🇷 Bruna ALEXANDRE
-SUMMARY:Women's Singles - WS10 - Quarterfinal 2
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 2
+SUMMARY: Anja HANDEN 🇸🇪 - 🇧🇷 Bruna ALEXANDRE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -240,6 +248,15 @@ SUMMARY: NG Mui Wui 🇭🇰 - 🇧🇷 Evellyn SANTOS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3-SRB-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3
+SUMMARY: Mitar PALIKUCA 🇷🇸 - 🇧🇷 Lucas ARABIAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T184500Z-para-table-tennis-WOMENS-SINGLES-WS1-2-ROUND-OF-16-THA
 DTSTAMP:20240902T184500Z
 DTSTART:20240902T184500Z
diff --git a/docs/en/para-table-tennis/CHI.ics b/docs/en/para-table-tennis/CHI.ics
index 03c023aa8..5010f3899 100644
--- a/docs/en/para-table-tennis/CHI.ics
+++ b/docs/en/para-table-tennis/CHI.ics
@@ -94,6 +94,15 @@ SUMMARY: Ignacio TORRES 🇨🇱 - 🇫🇷 Esteban HERRAULT
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4-CHI
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4
+SUMMARY: Manuel ECHAVEGUREN 🇨🇱 - 🇲🇪 Filip RADOVIC
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-TUR-CHI
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
diff --git a/docs/en/para-table-tennis/CHN.ics b/docs/en/para-table-tennis/CHN.ics
index 809fa7a6c..0ce6da21d 100644
--- a/docs/en/para-table-tennis/CHN.ics
+++ b/docs/en/para-table-tennis/CHN.ics
@@ -572,13 +572,30 @@ SUMMARY: LIAN Hao 🇨🇳 - 🇵🇱 Igor MISZTAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4-CHN-
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4
+SUMMARY: CAO Ningning 🇨🇳 - 🇹🇼 CHENG Ming Chih
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-POL
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: PENG Weinan 🇨🇳 - 🇵🇱 Piotr GRUDZIEN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-BEL
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇧🇪 Marc LEDOUX
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/CRO.ics b/docs/en/para-table-tennis/CRO.ics
index cab83da1c..cfe45a244 100644
--- a/docs/en/para-table-tennis/CRO.ics
+++ b/docs/en/para-table-tennis/CRO.ics
@@ -76,6 +76,15 @@ SUMMARY: Sonalben PATEL 🇮🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CRO-SWE
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Borna ZOHIL 🇭🇷 - 🇸🇪 Emil ANDERSSON
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T101500Z-para-table-tennis-WOMENS-SINGLES-WS3-QUARTERFINAL-2-CR
 DTSTAMP:20240904T101500Z
 DTSTART:20240904T101500Z
diff --git a/docs/en/para-table-tennis/FRA.ics b/docs/en/para-table-tennis/FRA.ics
index 9c9e676c0..c7d0383b9 100644
--- a/docs/en/para-table-tennis/FRA.ics
+++ b/docs/en/para-table-tennis/FRA.ics
@@ -302,13 +302,12 @@ SUMMARY: FUNAYAMA Mahiro 🇯🇵 - 🇫🇷 Mateo BOHEAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-KOR
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
 DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇫🇷
-  Florian MERRIEN
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Florian MERRIEN 🇫🇷 - 🇰🇷 BAEK Youngbok
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -339,6 +338,15 @@ SUMMARY: Viktor DIDUKH 🇺🇦 - 🇫🇷 Thomas BOUVAIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2-FRA-
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2
+SUMMARY: Nicolas SAVANT-AIRA 🇫🇷 - 🇳🇴 Tommy URHAUG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-POL-FRA
 DTSTAMP:20240902T184500Z
 DTSTART:20240902T184500Z
diff --git a/docs/en/para-table-tennis/GBR.ics b/docs/en/para-table-tennis/GBR.ics
index 79a5aecfa..400d6b851 100644
--- a/docs/en/para-table-tennis/GBR.ics
+++ b/docs/en/para-table-tennis/GBR.ics
@@ -166,23 +166,21 @@ SUMMARY: Ian SEIDENFELD 🇺🇸 - 🇬🇧 Martin PERRY
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-GBR-THA
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
 DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Billy SHILTON
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Billy SHILTON 🇬🇧 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-SVK-GBR
 DTSTAMP:20240902T184500Z
 DTSTART:20240902T184500Z
 DTEND:20240902T193000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Aaron McKIBBIN
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Richard CSEJTEY 🇸🇰 - 🇬🇧 Aaron McKIBBIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/GER.ics b/docs/en/para-table-tennis/GER.ics
index 1a3f50cc8..59ad885b2 100644
--- a/docs/en/para-table-tennis/GER.ics
+++ b/docs/en/para-table-tennis/GER.ics
@@ -166,13 +166,12 @@ SUMMARY: Vasyl PETRUNIV 🇺🇦 - 🇩🇪 Thomas SCHMIDBERGER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1-GER-
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
 DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1\n🇩🇪
-  Valentin BAUS
-SUMMARY:Men's Singles - MS5 - Quarterfinal 1
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1
+SUMMARY: Valentin BAUS 🇩🇪 - 🇹🇷 Ali OZTURK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/KOR.ics b/docs/en/para-table-tennis/KOR.ics
index 00cb73d58..8feab7846 100644
--- a/docs/en/para-table-tennis/KOR.ics
+++ b/docs/en/para-table-tennis/KOR.ics
@@ -211,6 +211,15 @@ SUMMARY: JANG Yeongjin 🇰🇷 - 🇵🇱 Maciej NALEPKA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-KOR
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Florian MERRIEN 🇫🇷 - 🇰🇷 BAEK Youngbok
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-SVK-KOR
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
diff --git a/docs/en/para-table-tennis/MNE.ics b/docs/en/para-table-tennis/MNE.ics
index dfc0b2bf5..21147fe40 100644
--- a/docs/en/para-table-tennis/MNE.ics
+++ b/docs/en/para-table-tennis/MNE.ics
@@ -13,13 +13,12 @@ SUMMARY: Luka BAKIC 🇲🇪 - 🇯🇵 FUNAYAMA Mahiro
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4
+UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4-CHI
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
 DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4\n🇲🇪
-  Filip RADOVIC
-SUMMARY:Men's Singles - MS10 - Quarterfinal 4
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4
+SUMMARY: Manuel ECHAVEGUREN 🇨🇱 - 🇲🇪 Filip RADOVIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/NOR.ics b/docs/en/para-table-tennis/NOR.ics
index fc590008d..7131c9d74 100644
--- a/docs/en/para-table-tennis/NOR.ics
+++ b/docs/en/para-table-tennis/NOR.ics
@@ -40,13 +40,12 @@ SUMMARY: Camelia CIRIPAN 🇷🇴 - 🇳🇴 Merethe TVEITEN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2-FRA-
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2\n🇳🇴
-  Tommy URHAUG
-SUMMARY:Men's Singles - MS5 - Quarterfinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2
+SUMMARY: Nicolas SAVANT-AIRA 🇫🇷 - 🇳🇴 Tommy URHAUG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/POL.ics b/docs/en/para-table-tennis/POL.ics
index d0c32564a..1ff1005d8 100644
--- a/docs/en/para-table-tennis/POL.ics
+++ b/docs/en/para-table-tennis/POL.ics
@@ -220,13 +220,12 @@ SUMMARY: LIAN Hao 🇨🇳 - 🇵🇱 Igor MISZTAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1-POL
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
 DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1\n🇵🇱
-  Patryk CHOJNOWSKI
-SUMMARY:Men's Singles - MS10 - Quarterfinal 1
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1
+SUMMARY: Patryk CHOJNOWSKI 🇵🇱 - 🇧🇷 Claudio MASSAD
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -239,13 +238,12 @@ SUMMARY: Merve DEMIR 🇹🇷 - 🇵🇱 Natalia PARTYKA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-POL
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇵🇱
-  Piotr GRUDZIEN
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: PENG Weinan 🇨🇳 - 🇵🇱 Piotr GRUDZIEN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/SRB.ics b/docs/en/para-table-tennis/SRB.ics
index 0d09dfcab..a2f60cb1d 100644
--- a/docs/en/para-table-tennis/SRB.ics
+++ b/docs/en/para-table-tennis/SRB.ics
@@ -40,13 +40,12 @@ SUMMARY: Nada MATIC 🇷🇸 - 🇫🇷 Flora VAUTIER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3-SRB-
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
 DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3\n🇷🇸
-  Mitar PALIKUCA
-SUMMARY:Men's Singles - MS5 - Quarterfinal 3
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3
+SUMMARY: Mitar PALIKUCA 🇷🇸 - 🇧🇷 Lucas ARABIAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/SVK.ics b/docs/en/para-table-tennis/SVK.ics
index f713a5bb8..03a9ab36a 100644
--- a/docs/en/para-table-tennis/SVK.ics
+++ b/docs/en/para-table-tennis/SVK.ics
@@ -120,4 +120,13 @@ DESCRIPTION:Para Table Tennis - Men's Singles - MS4 - Round of 16
 SUMMARY: Filip NACHAZEL 🇨🇿 - 🇸🇰 Boris TRAVNICEK
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-SVK-GBR
+DTSTAMP:20240902T184500Z
+DTSTART:20240902T184500Z
+DTEND:20240902T193000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Richard CSEJTEY 🇸🇰 - 🇬🇧 Aaron McKIBBIN
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/SWE.ics b/docs/en/para-table-tennis/SWE.ics
index dcdae470a..6e33d4db8 100644
--- a/docs/en/para-table-tennis/SWE.ics
+++ b/docs/en/para-table-tennis/SWE.ics
@@ -76,13 +76,21 @@ SUMMARY: Jonas HANSSON 🇸🇪 - 🇧🇷 Paulo SALMIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2-S
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 2
+SUMMARY: Anja HANDEN 🇸🇪 - 🇧🇷 Bruna ALEXANDRE
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CRO-SWE
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇸🇪
-  Emil ANDERSSON
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Borna ZOHIL 🇭🇷 - 🇸🇪 Emil ANDERSSON
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/THA.ics b/docs/en/para-table-tennis/THA.ics
index 410565b6c..a90d12391 100644
--- a/docs/en/para-table-tennis/THA.ics
+++ b/docs/en/para-table-tennis/THA.ics
@@ -212,6 +212,15 @@ SUMMARY: Wanchai CHAIWUT 🇹🇭 - 🇦🇺 Christopher ADDIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-GBR-THA
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Billy SHILTON 🇬🇧 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T184500Z-para-table-tennis-WOMENS-SINGLES-WS1-2-ROUND-OF-16-THA
 DTSTAMP:20240902T184500Z
 DTSTART:20240902T184500Z
diff --git a/docs/en/para-table-tennis/TPE.ics b/docs/en/para-table-tennis/TPE.ics
index 18f606cd4..ff7c29c6c 100644
--- a/docs/en/para-table-tennis/TPE.ics
+++ b/docs/en/para-table-tennis/TPE.ics
@@ -49,13 +49,21 @@ SUMMARY: Qian YANG 🇦🇺 - 🇹🇼 LIN Tzu Yu
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4
+UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3-A
+DTSTAMP:20240902T163000Z
+DTSTART:20240902T163000Z
+DTEND:20240902T171500Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 3
+SUMMARY: Melissa TAPPER 🇦🇺 - 🇹🇼 TIAN Shiau Wen
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4-CHN-
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4\n🇹🇼
-  CHENG Ming Chih
-SUMMARY:Men's Singles - MS5 - Quarterfinal 4
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4
+SUMMARY: CAO Ningning 🇨🇳 - 🇹🇼 CHENG Ming Chih
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/TUR.ics b/docs/en/para-table-tennis/TUR.ics
index 9181e42e0..9f9066751 100644
--- a/docs/en/para-table-tennis/TUR.ics
+++ b/docs/en/para-table-tennis/TUR.ics
@@ -103,6 +103,15 @@ SUMMARY: Merve DEMIR 🇹🇷 - 🇵🇱 Natalia PARTYKA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1-GER-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1
+SUMMARY: Valentin BAUS 🇩🇪 - 🇹🇷 Ali OZTURK
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T171500Z-para-table-tennis-WOMENS-SINGLES-WS11-QUARTERFINAL-1-T
 DTSTAMP:20240903T171500Z
 DTSTART:20240903T171500Z
diff --git a/docs/en/para-table-tennis/general.ics b/docs/en/para-table-tennis/general.ics
index 141f15c80..0b1f86589 100644
--- a/docs/en/para-table-tennis/general.ics
+++ b/docs/en/para-table-tennis/general.ics
@@ -1781,6 +1781,15 @@ SUMMARY: FUNAYAMA Mahiro 🇯🇵 - 🇫🇷 Mateo BOHEAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-KOR
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Florian MERRIEN 🇫🇷 - 🇰🇷 BAEK Youngbok
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-3-CHN
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
@@ -1790,6 +1799,15 @@ SUMMARY: LIAN Hao 🇨🇳 - 🇵🇱 Igor MISZTAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1-POL
+DTSTAMP:20240902T150000Z
+DTSTART:20240902T150000Z
+DTEND:20240902T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1
+SUMMARY: Patryk CHOJNOWSKI 🇵🇱 - 🇧🇷 Claudio MASSAD
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-UKR-GER
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
@@ -1808,23 +1826,12 @@ SUMMARY: Wanchai CHAIWUT 🇹🇭 - 🇦🇺 Christopher ADDIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1
-DTSTAMP:20240902T150000Z
-DTSTART:20240902T150000Z
-DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 1\n🇵🇱
-  Patryk CHOJNOWSKI
-SUMMARY:Men's Singles - MS10 - Quarterfinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T150000Z
-DTSTART:20240902T150000Z
-DTEND:20240902T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇫🇷
-  Florian MERRIEN
-SUMMARY:Men's Singles - MS3 - Round of 16
+UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2-S
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 2
+SUMMARY: Anja HANDEN 🇸🇪 - 🇧🇷 Bruna ALEXANDRE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -1837,6 +1844,15 @@ SUMMARY: Emeric MARTIN 🇫🇷 - 🇯🇵 SHICHINO Kazuki
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4-CHI
+DTSTAMP:20240902T154500Z
+DTSTART:20240902T154500Z
+DTEND:20240902T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4
+SUMMARY: Manuel ECHAVEGUREN 🇨🇱 - 🇲🇪 Filip RADOVIC
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-TUR-CHI
 DTSTAMP:20240902T154500Z
 DTSTART:20240902T154500Z
@@ -1864,26 +1880,6 @@ SUMMARY: Qian YANG 🇦🇺 - 🇹🇼 LIN Tzu Yu
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-4
-DTSTAMP:20240902T154500Z
-DTSTART:20240902T154500Z
-DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Quarterfinal 4\n🇲🇪
-  Filip RADOVIC
-SUMMARY:Men's Singles - MS10 - Quarterfinal 4
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T154500Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-2
-DTSTAMP:20240902T154500Z
-DTSTART:20240902T154500Z
-DTEND:20240902T163000Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  2\n🇧🇷 Bruna ALEXANDRE
-SUMMARY:Women's Singles - WS10 - Quarterfinal 2
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T163000Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-TUR-NGR
 DTSTAMP:20240902T163000Z
 DTSTART:20240902T163000Z
@@ -1902,6 +1898,15 @@ SUMMARY: Filip NACHAZEL 🇨🇿 - 🇸🇰 Boris TRAVNICEK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3-A
+DTSTAMP:20240902T163000Z
+DTSTART:20240902T163000Z
+DTEND:20240902T171500Z
+DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal 3
+SUMMARY: Melissa TAPPER 🇦🇺 - 🇹🇼 TIAN Shiau Wen
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-4-T
 DTSTAMP:20240902T163000Z
 DTSTART:20240902T163000Z
@@ -1929,13 +1934,12 @@ SUMMARY: SAITO Genki 🇯🇵 - 🇫🇷 Maxime THOMAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T163000Z-para-table-tennis-WOMENS-SINGLES-WS10-QUARTERFINAL-3
-DTSTAMP:20240902T163000Z
-DTSTART:20240902T163000Z
-DTEND:20240902T171500Z
-DESCRIPTION:Para Table Tennis - Women's Singles - WS10 - Quarterfinal
-  3\n🇦🇺 Melissa TAPPER
-SUMMARY:Women's Singles - WS10 - Quarterfinal 3
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-GBR-THA
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Billy SHILTON 🇬🇧 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -1948,6 +1952,24 @@ SUMMARY: Francisco Javier LOPEZ 🇪🇸 - 🇰🇷 KIM Young-Gun
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3-SRB-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3
+SUMMARY: Mitar PALIKUCA 🇷🇸 - 🇧🇷 Lucas ARABIAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1-GER-
+DTSTAMP:20240902T171500Z
+DTSTART:20240902T171500Z
+DTEND:20240902T180000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1
+SUMMARY: Valentin BAUS 🇩🇪 - 🇹🇷 Ali OZTURK
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-UKR-FRA
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
@@ -1957,36 +1979,6 @@ SUMMARY: Viktor DIDUKH 🇺🇦 - 🇫🇷 Thomas BOUVAIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-1
-DTSTAMP:20240902T171500Z
-DTSTART:20240902T171500Z
-DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 1\n🇩🇪
-  Valentin BAUS
-SUMMARY:Men's Singles - MS5 - Quarterfinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-3
-DTSTAMP:20240902T171500Z
-DTSTART:20240902T171500Z
-DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 3\n🇷🇸
-  Mitar PALIKUCA
-SUMMARY:Men's Singles - MS5 - Quarterfinal 3
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T171500Z
-DTSTART:20240902T171500Z
-DTEND:20240902T180000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Billy SHILTON
-SUMMARY:Men's Singles - MS8 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T171500Z-para-table-tennis-WOMENS-SINGLES-WS11-ROUND-OF-16
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
@@ -1997,6 +1989,33 @@ SUMMARY:Women's Singles - WS11 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CRO-SWE
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Borna ZOHIL 🇭🇷 - 🇸🇪 Emil ANDERSSON
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4-CHN-
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4
+SUMMARY: CAO Ningning 🇨🇳 - 🇹🇼 CHENG Ming Chih
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2-FRA-
+DTSTAMP:20240902T180000Z
+DTSTART:20240902T180000Z
+DTEND:20240902T184500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2
+SUMMARY: Nicolas SAVANT-AIRA 🇫🇷 - 🇳🇴 Tommy URHAUG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T180000Z-para-table-tennis-WOMENS-SINGLES-WS1-2-ROUND-OF-16-EGY
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
@@ -2006,53 +2025,21 @@ SUMMARY: Ola SOLIMAN 🇪🇬 - 🇩🇪 Jana SPEGEL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-2
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-POL
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 2\n🇳🇴
-  Tommy URHAUG
-SUMMARY:Men's Singles - MS5 - Quarterfinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: PENG Weinan 🇨🇳 - 🇵🇱 Piotr GRUDZIEN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS5-QUARTERFINAL-4
+UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-CHN-BEL
 DTSTAMP:20240902T180000Z
 DTSTART:20240902T180000Z
 DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS5 - Quarterfinal 4\n🇹🇼
-  CHENG Ming Chih
-SUMMARY:Men's Singles - MS5 - Quarterfinal 4
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T180000Z
-DTSTART:20240902T180000Z
-DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T180000Z
-DTSTART:20240902T180000Z
-DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇵🇱
-  Piotr GRUDZIEN
-SUMMARY:Men's Singles - MS8 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T180000Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
-DTSTAMP:20240902T180000Z
-DTSTART:20240902T180000Z
-DTEND:20240902T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇸🇪
-  Emil ANDERSSON
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇧🇪 Marc LEDOUX
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -2101,13 +2088,12 @@ SUMMARY: Maksym NIKOLENKO 🇺🇦 - 🇪🇸 Alejandro DIAZ
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16
+UID:20240902T184500Z-para-table-tennis-MENS-SINGLES-MS8-ROUND-OF-16-SVK-GBR
 DTSTAMP:20240902T184500Z
 DTSTART:20240902T184500Z
 DTEND:20240902T193000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16\n🇬🇧
-  Aaron McKIBBIN
-SUMMARY:Men's Singles - MS8 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Round of 16
+SUMMARY: Richard CSEJTEY 🇸🇰 - 🇬🇧 Aaron McKIBBIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/medals.html b/docs/medals.html
index ffa24823c..bb306bd9f 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -66,14 +66,19 @@
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇨🇳 China</span>
-    <span class="inline-block text-center w-1/6 flex-none">36</span>
+    <span class="inline-block text-center w-1/6 flex-none">37</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">13</span>
-    <span class="inline-block text-center w-1/6 flex-none">77</span>
+    <span class="inline-block text-center w-1/6 flex-none">78</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>LIN Ximei</td>
+      <td>Boccia - Women's Individual - BC4 Gold Medal Match</td>
+    </tr>
     <tr>
       <td class="bronze">&#9679;</td>
       <td>HUANG Jun</td>
@@ -714,14 +719,24 @@
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇺🇸 United States</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">14</span>
     <span class="inline-block text-center w-1/6 flex-none">10</span>
-    <span class="inline-block text-center w-1/6 flex-none">33</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">10</span>
+    <span class="inline-block text-center w-1/6 flex-none">35</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>Carson CLOUGH</td>
+      <td>Para Triathlon - Men's PTS4</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Chris HAMMER</td>
+      <td>Para Triathlon - Men's PTS5</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>KRAJEWSKI/SIMON</td>
@@ -894,182 +909,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">🇧🇷 Brazil</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">5</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">29</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>Elizabeth RODRIGUES GOMES</td>
-      <td>Para Athletics - Women's Shot Put - F54 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Claudiney BATISTA dos SANTOS</td>
-      <td>Para Athletics - Men's Discus Throw - F56 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Andre ROCHA</td>
-      <td>Para Athletics - Men's Discus Throw - F52 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Brazil</td>
-      <td>Para Swimming - Mixed 4x100m Freestyle Relay - S14 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Lidia VIEIRA da CRUZ</td>
-      <td>Para Swimming - Women's 150m Individual Medley - SM4 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Alexandre Augusto GALGANI</td>
-      <td>Shooting Para Sport - R5 - Mixed 10m Air Rifle Prone SH2 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Cicero Valdiran LINS NOBRE</td>
-      <td>Para Athletics - Men's Javelin Throw - F57 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Fernanda Yara da SILVA</td>
-      <td>Para Athletics - Women's 400m - T47 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Maria Clara AUGUSTO da SILVA</td>
-      <td>Para Athletics - Women's 400m - T47 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Joeferson MARINHO de OLIVEIRA</td>
-      <td>Para Athletics - Men's 100m - T12 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Wendell BELARMINO PEREIRA</td>
-      <td>Para Swimming - Men's 50m Freestyle - S11 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Thalita Vitoria SIMPLICIO da SILVA</td>
-      <td>Para Athletics - Women's 400m - T11 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Gabriel Geraldo dos SANTOS ARAUJO</td>
-      <td>Para Swimming - Men's 50m Backstroke - S2 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Maria Carolina GOMES SANTIAGO</td>
-      <td>Para Swimming - Women's 100m Backstroke - S12 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>MANARA/MASSAD</td>
-      <td>Para Table Tennis - Men's Doubles - MD18 - Semifinal 1</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>ALEXANDRE/RAUEN</td>
-      <td>Para Table Tennis - Women's Doubles - WD20 - Semifinal 2</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Ana Carolina SILVA de MOURA</td>
-      <td>Para Taekwondo - Women K44 -65kg Gold Medal Contest</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Giovanna BOSCOLO CASTILHO GONCALV</td>
-      <td>Para Athletics - Women's Club Throw - F32 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Silvana Mayara CARDOSO FERNANDES</td>
-      <td>Para Taekwondo - Women K44 -57kg Bronze Medal Contests</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Brazil</td>
-      <td>Para Swimming - Mixed 4x50m Freestyle Relay - 20 Points Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Petrucio FERREIRA dos SANTOS</td>
-      <td>Para Athletics - Men's 100m - T47 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Ricardo GOMES de MENDONCA</td>
-      <td>Para Athletics - Men's 100m - T37 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Talisson Henrique GLOCK</td>
-      <td>Para Swimming - Men's 200m Individual Medley - SM6 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>OLIVEIRA/OLIVEIRA</td>
-      <td>Para Table Tennis - Women's Doubles - WD5 - Semifinal 1</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Julio Cesar AGRIPINO dos SANTOS</td>
-      <td>Para Athletics - Men's 5000m - T11 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Yeltsin JACQUES</td>
-      <td>Para Athletics - Men's 5000m - T11 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Phelipe Andrews MELO RODRIGUES</td>
-      <td>Para Swimming - Men's 50m Freestyle - S10 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Gabriel BANDEIRA</td>
-      <td>Para Swimming - Men's 100m Butterfly - S14 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Gabriel Geraldo dos SANTOS ARAUJO</td>
-      <td>Para Swimming - Men's 100m Backstroke - S2 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">🇫🇷 France</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">9</span>
     <span class="inline-block text-center w-1/6 flex-none">10</span>
     <span class="inline-block text-center w-1/6 flex-none">13</span>
-    <span class="inline-block text-center w-1/6 flex-none">31</span>
+    <span class="inline-block text-center w-1/6 flex-none">32</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>Alexis HANQUINQUANT</td>
+      <td>Para Triathlon - Men's PTS4</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Thibaut RIGAUDEAU</td>
@@ -1232,6 +1088,175 @@
   </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">🇧🇷 Brazil</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">6</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="silver">&#9679;</td>
+      <td>Ronan CORDEIRO</td>
+      <td>Para Triathlon - Men's PTS5</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Elizabeth RODRIGUES GOMES</td>
+      <td>Para Athletics - Women's Shot Put - F54 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Claudiney BATISTA dos SANTOS</td>
+      <td>Para Athletics - Men's Discus Throw - F56 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Andre ROCHA</td>
+      <td>Para Athletics - Men's Discus Throw - F52 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Brazil</td>
+      <td>Para Swimming - Mixed 4x100m Freestyle Relay - S14 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Lidia VIEIRA da CRUZ</td>
+      <td>Para Swimming - Women's 150m Individual Medley - SM4 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Alexandre Augusto GALGANI</td>
+      <td>Shooting Para Sport - R5 - Mixed 10m Air Rifle Prone SH2 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-31</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Cicero Valdiran LINS NOBRE</td>
+      <td>Para Athletics - Men's Javelin Throw - F57 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Fernanda Yara da SILVA</td>
+      <td>Para Athletics - Women's 400m - T47 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Maria Clara AUGUSTO da SILVA</td>
+      <td>Para Athletics - Women's 400m - T47 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Joeferson MARINHO de OLIVEIRA</td>
+      <td>Para Athletics - Men's 100m - T12 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Wendell BELARMINO PEREIRA</td>
+      <td>Para Swimming - Men's 50m Freestyle - S11 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Thalita Vitoria SIMPLICIO da SILVA</td>
+      <td>Para Athletics - Women's 400m - T11 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Gabriel Geraldo dos SANTOS ARAUJO</td>
+      <td>Para Swimming - Men's 50m Backstroke - S2 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Maria Carolina GOMES SANTIAGO</td>
+      <td>Para Swimming - Women's 100m Backstroke - S12 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>MANARA/MASSAD</td>
+      <td>Para Table Tennis - Men's Doubles - MD18 - Semifinal 1</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>ALEXANDRE/RAUEN</td>
+      <td>Para Table Tennis - Women's Doubles - WD20 - Semifinal 2</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Ana Carolina SILVA de MOURA</td>
+      <td>Para Taekwondo - Women K44 -65kg Gold Medal Contest</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Giovanna BOSCOLO CASTILHO GONCALV</td>
+      <td>Para Athletics - Women's Club Throw - F32 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Silvana Mayara CARDOSO FERNANDES</td>
+      <td>Para Taekwondo - Women K44 -57kg Bronze Medal Contests</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Brazil</td>
+      <td>Para Swimming - Mixed 4x50m Freestyle Relay - 20 Points Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Petrucio FERREIRA dos SANTOS</td>
+      <td>Para Athletics - Men's 100m - T47 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Ricardo GOMES de MENDONCA</td>
+      <td>Para Athletics - Men's 100m - T37 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Talisson Henrique GLOCK</td>
+      <td>Para Swimming - Men's 200m Individual Medley - SM6 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>OLIVEIRA/OLIVEIRA</td>
+      <td>Para Table Tennis - Women's Doubles - WD5 - Semifinal 1</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Julio Cesar AGRIPINO dos SANTOS</td>
+      <td>Para Athletics - Men's 5000m - T11 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Yeltsin JACQUES</td>
+      <td>Para Athletics - Men's 5000m - T11 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Phelipe Andrews MELO RODRIGUES</td>
+      <td>Para Swimming - Men's 50m Freestyle - S10 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Gabriel BANDEIRA</td>
+      <td>Para Swimming - Men's 100m Butterfly - S14 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Gabriel Geraldo dos SANTOS ARAUJO</td>
+      <td>Para Swimming - Men's 100m Backstroke - S2 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">
@@ -1667,12 +1692,17 @@
     <span class="inline-block flex-auto">🇪🇸 Spain</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">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">17</span>
+    <span class="inline-block text-center w-1/6 flex-none">10</span>
+    <span class="inline-block text-center w-1/6 flex-none">18</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>Nil RIUDAVETS VICTORY</td>
+      <td>Para Triathlon - Men's PTS4</td>
+    </tr>
     <tr>
       <td class="gold">&#9679;</td>
       <td>Susana RODRIGUEZ</td>
@@ -2498,8 +2528,8 @@
     <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">7</span>
-    <span class="inline-block text-center w-1/6 flex-none">13</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>
   </div>
   <div class="collapse-content">
   <table class="table-full">
@@ -2509,6 +2539,11 @@
       <td>Anja RENNER</td>
       <td>Para Triathlon - Women's PTVI</td>
     </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Martin SCHULZ</td>
+      <td>Para Triathlon - Men's PTS5</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Niko KAPPEL</td>
@@ -3058,6 +3093,43 @@
   </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">🇭🇰 Hong Kong</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">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">4</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>CHEUNG Yuen</td>
+      <td>Boccia - Women's Individual - BC4 Gold Medal Match</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>LOUNG John</td>
+      <td>Boccia - Men's Individual - BC1 Gold Medal Match</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>NG Cheuk Yan</td>
+      <td>Para Swimming - Women's 100m Breaststroke - SB6 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>CHAN Yui Lam</td>
+      <td>Para Swimming - Women's 100m Butterfly - S14 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">
@@ -3127,38 +3199,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">🇭🇰 Hong Kong</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>
-    <span class="inline-block text-center w-1/6 flex-none">1</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</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>LOUNG John</td>
-      <td>Boccia - Men's Individual - BC1 Gold Medal Match</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>NG Cheuk Yan</td>
-      <td>Para Swimming - Women's 100m Breaststroke - SB6 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>CHAN Yui Lam</td>
-      <td>Para Swimming - Women's 100m Butterfly - S14 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 b9d33ebbb..30795c3c2 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -30904,6 +30904,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T150000Z" data-end="20240902T154500Z" data-noc="FRA,KOR" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS3 - Round of 16</div>
+    <div class="competitors">
+      Florian MERRIEN
+      🇫🇷
+      -
+      🇰🇷
+      BAEK Youngbok
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T150000Z" data-end="20240902T154500Z" data-noc="CHN,POL" >
  <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>
@@ -30925,6 +30946,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T150000Z" data-end="20240902T154500Z" data-noc="BRA,POL" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS10 - Quarterfinal 1</div>
+    <div class="competitors">
+      Patryk CHOJNOWSKI
+      🇵🇱
+      -
+      🇧🇷
+      Claudio MASSAD
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T150000Z" data-end="20240902T154500Z" data-noc="GER,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>
@@ -30967,36 +31009,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T150000Z" data-end="20240902T154500Z" data-noc="POL" >
- <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS10 - Quarterfinal 1</div>
-    <div class="competitor POL">🇵🇱 Patryk CHOJNOWSKI </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T150000Z" data-end="20240902T154500Z" data-noc="FRA" >
- <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS3 - Round of 16</div>
-    <div class="competitor FRA">🇫🇷 Florian MERRIEN </div>
- </div>
-</div>
 <div class="event py-4 bg-amber-400" data-start="20240902T150000Z" data-end="20240902T160000Z" data-noc="COL,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">
   <span class="time-start">__:__</span>
@@ -31172,6 +31184,27 @@
     <div class="competitor CAN">🇨🇦 Sabrina DUCHESNE </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T163000Z" data-noc="BRA,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">
+  <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div>Women's Singles - WS10 - Quarterfinal 2</div>
+    <div class="competitors">
+      Anja HANDEN
+      🇸🇪
+      -
+      🇧🇷
+      Bruna ALEXANDRE
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T163000Z" data-noc="FRA,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">
   <span class="time-start">__:__</span>
@@ -31193,6 +31226,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T163000Z" data-noc="CHI,MNE" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS10 - Quarterfinal 4</div>
+    <div class="competitors">
+      Manuel ECHAVEGUREN
+      🇨🇱
+      -
+      🇲🇪
+      Filip RADOVIC
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T163000Z" data-noc="CHI,TUR" >
  <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>
@@ -31256,36 +31310,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T163000Z" data-noc="MNE" >
- <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS10 - Quarterfinal 4</div>
-    <div class="competitor MNE">🇲🇪 Filip RADOVIC </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T163000Z" data-noc="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">
-  <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div>Women's Singles - WS10 - Quarterfinal 2</div>
-    <div class="competitor BRA">🇧🇷 Bruna ALEXANDRE </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240902T154500Z" data-end="20240902T164500Z" data-noc="CHN,FRA" >
  <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>
@@ -31579,6 +31603,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T163000Z" data-end="20240902T171500Z" data-noc="AUS,TPE" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div>Women's Singles - WS10 - Quarterfinal 3</div>
+    <div class="competitors">
+      Melissa TAPPER
+      🇦🇺
+      -
+      🇹🇼
+      TIAN Shiau Wen
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T163000Z" data-end="20240902T171500Z" data-noc="POL,TUR" >
  <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>
@@ -31642,21 +31687,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T163000Z" data-end="20240902T171500Z" data-noc="AUS" >
- <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div>Women's Singles - WS10 - Quarterfinal 3</div>
-    <div class="competitor AUS">🇦🇺 Melissa TAPPER </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240902T163000Z" data-end="20240902T173000Z" data-noc="CHN,TUR" >
  <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>
@@ -31840,6 +31870,27 @@
     <div class="competitor EGY">🇪🇬 Zeyad KAHIL </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="GBR,THA" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS8 - Round of 16</div>
+    <div class="competitors">
+      Billy SHILTON
+      🇬🇧
+      -
+      🇹🇭
+      Phisit WANGPHONPHATHANASIRI
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="ESP,KOR" >
  <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>
@@ -31861,6 +31912,48 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="BRA,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">
+  <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS5 - Quarterfinal 3</div>
+    <div class="competitors">
+      Mitar PALIKUCA
+      🇷🇸
+      -
+      🇧🇷
+      Lucas ARABIAN
+    </div>
+ </div>
+</div>
+<div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="GER,TUR" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS5 - Quarterfinal 1</div>
+    <div class="competitors">
+      Valentin BAUS
+      🇩🇪
+      -
+      🇹🇷
+      Ali OZTURK
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="FRA,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>
@@ -31882,51 +31975,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="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">
-  <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS5 - Quarterfinal 1</div>
-    <div class="competitor GER">🇩🇪 Valentin BAUS </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="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">
-  <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS5 - Quarterfinal 3</div>
-    <div class="competitor SRB">🇷🇸 Mitar PALIKUCA </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" 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">
-  <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS8 - Round of 16</div>
-    <div class="competitor GBR">🇬🇧 Billy SHILTON </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240902T171500Z" data-end="20240902T180000Z" data-noc="CZE" >
  <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>
@@ -32146,6 +32194,69 @@
     <div class="competitor CRC">🇨🇷 Sherman Isidro GUITY GUITY </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="CRO,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">
+  <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS8 - Round of 16</div>
+    <div class="competitors">
+      Borna ZOHIL
+      🇭🇷
+      -
+      🇸🇪
+      Emil ANDERSSON
+    </div>
+ </div>
+</div>
+<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="CHN,TPE" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS5 - Quarterfinal 4</div>
+    <div class="competitors">
+      CAO Ningning
+      🇨🇳
+      -
+      🇹🇼
+      CHENG Ming Chih
+    </div>
+ </div>
+</div>
+<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="FRA,NOR" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS5 - Quarterfinal 2</div>
+    <div class="competitors">
+      Nicolas SAVANT-AIRA
+      🇫🇷
+      -
+      🇳🇴
+      Tommy URHAUG
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="EGY,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">
   <span class="time-start">__:__</span>
@@ -32167,37 +32278,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="NOR" >
- <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS5 - Quarterfinal 2</div>
-    <div class="competitor NOR">🇳🇴 Tommy URHAUG </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="TPE" >
- <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS5 - Quarterfinal 4</div>
-    <div class="competitor TPE">🇹🇼 CHENG Ming Chih </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="CHN" >
+<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="CHN,POL" >
  <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>
@@ -32209,10 +32290,16 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles - MS8 - Round of 16</div>
-    <div class="competitor CHN">🇨🇳 ZHAO Shuai </div>
+    <div class="competitors">
+      PENG Weinan
+      🇨🇳
+      -
+      🇵🇱
+      Piotr GRUDZIEN
+    </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="POL" >
+<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="BEL,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">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -32224,22 +32311,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles - MS8 - Round of 16</div>
-    <div class="competitor POL">🇵🇱 Piotr GRUDZIEN </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T180000Z" data-end="20240902T184500Z" data-noc="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">
-  <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">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS8 - Round of 16</div>
-    <div class="competitor SWE">🇸🇪 Emil ANDERSSON </div>
+    <div class="competitors">
+      ZHAO Shuai
+      🇨🇳
+      -
+      🇧🇪
+      Marc LEDOUX
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240902T180000Z" data-end="20240902T191500Z" data-noc="AUS,KOR" >
@@ -32563,7 +32641,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T184500Z" data-end="20240902T193000Z" data-noc="GBR" >
+<div class="event py-4 " data-start="20240902T184500Z" data-end="20240902T193000Z" data-noc="GBR,SVK" >
  <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>
@@ -32575,7 +32653,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles - MS8 - Round of 16</div>
-    <div class="competitor GBR">🇬🇧 Aaron McKIBBIN </div>
+    <div class="competitors">
+      Richard CSEJTEY
+      🇸🇰
+      -
+      🇬🇧
+      Aaron McKIBBIN
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-orange-700" data-start="20240902T191000Z" data-end="20240902T204000Z" data-noc="BRA,HKG" >