diff --git a/docs/en/boccia/BRA.ics b/docs/en/boccia/BRA.ics
index 934cee65b..7fd2d9348 100644
--- a/docs/en/boccia/BRA.ics
+++ b/docs/en/boccia/BRA.ics
@@ -166,12 +166,12 @@ SUMMARY: Aurelien FABRE 🇫🇷 - 🇧🇷 Iuri SILVA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-NE
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-BR
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
-SUMMARY: Daniel PEREZ 🇳🇱 - 🇧🇷 Jose OLIVEIRA
+SUMMARY: Jose OLIVEIRA 🇧🇷 - 🇳🇱 Daniel PEREZ
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/CAN.ics b/docs/en/boccia/CAN.ics
index 58646879c..4fbfcaba7 100644
--- a/docs/en/boccia/CAN.ics
+++ b/docs/en/boccia/CAN.ics
@@ -85,12 +85,12 @@ SUMMARY: YAN Zhiqiang 🇨🇳 - 🇨🇦 Danik ALLARD
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-HK
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-CA
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool D
-SUMMARY: LOUNG John 🇭🇰 - 🇨🇦 Lance CRYDERMAN
+SUMMARY: Lance CRYDERMAN 🇨🇦 - 🇭🇰 LOUNG John
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/HKG.ics b/docs/en/boccia/HKG.ics
index 05f81c35c..97c16f8ec 100644
--- a/docs/en/boccia/HKG.ics
+++ b/docs/en/boccia/HKG.ics
@@ -85,12 +85,12 @@ SUMMARY: Nuanchan PHONSILA 🇹🇭 - 🇭🇰 CHEUNG Yuen
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-HK
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-CA
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool D
-SUMMARY: LOUNG John 🇭🇰 - 🇨🇦 Lance CRYDERMAN
+SUMMARY: Lance CRYDERMAN 🇨🇦 - 🇭🇰 LOUNG John
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/KOR.ics b/docs/en/boccia/KOR.ics
index 7f1894272..f530afe89 100644
--- a/docs/en/boccia/KOR.ics
+++ b/docs/en/boccia/KOR.ics
@@ -94,12 +94,12 @@ SUMMARY: JEONG Soyeong 🇰🇷 - 🇵🇹 Ana CORREIA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-KO
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-SV
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
-SUMMARY: KIM Dohyun 🇰🇷 - 🇸🇰 Tomas KRAL
+SUMMARY: Tomas KRAL 🇸🇰 - 🇰🇷 KIM Dohyun
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/NED.ics b/docs/en/boccia/NED.ics
index 21ddd981d..7ea44ee04 100644
--- a/docs/en/boccia/NED.ics
+++ b/docs/en/boccia/NED.ics
@@ -49,12 +49,12 @@ SUMMARY: Chantal van ENGELEN 🇳🇱 - 🇮🇩 Gischa ZAYANA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-NE
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-BR
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
-SUMMARY: Daniel PEREZ 🇳🇱 - 🇧🇷 Jose OLIVEIRA
+SUMMARY: Jose OLIVEIRA 🇧🇷 - 🇳🇱 Daniel PEREZ
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/SVK.ics b/docs/en/boccia/SVK.ics
index e698c1c94..bd161118b 100644
--- a/docs/en/boccia/SVK.ics
+++ b/docs/en/boccia/SVK.ics
@@ -103,12 +103,12 @@ SUMMARY: Watcharaphon VONGSA 🇹🇭 - 🇸🇰 Robert MEZIK
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-KO
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-SV
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
-SUMMARY: KIM Dohyun 🇰🇷 - 🇸🇰 Tomas KRAL
+SUMMARY: Tomas KRAL 🇸🇰 - 🇰🇷 KIM Dohyun
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/general.ics b/docs/en/boccia/general.ics
index b1de75b63..77a175669 100644
--- a/docs/en/boccia/general.ics
+++ b/docs/en/boccia/general.ics
@@ -1102,15 +1102,6 @@ SUMMARY: Claire TAGGART 🇬🇧 - 🇵🇹 Cristina GONCALVES
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-NE
-DTSTAMP:20240830T183000Z
-DTSTART:20240830T183000Z
-DTEND:20240830T193000Z
-DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
-SUMMARY: Daniel PEREZ 🇳🇱 - 🇧🇷 Jose OLIVEIRA
-LOCATION:South Paris Arena 1
-END:VEVENT
-BEGIN:VEVENT
 UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-C-ME
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
@@ -1129,21 +1120,30 @@ SUMMARY: JEONG Soyeong 🇰🇷 - 🇵🇹 Ana CORREIA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-KO
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-BR
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
-DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
-SUMMARY: KIM Dohyun 🇰🇷 - 🇸🇰 Tomas KRAL
+DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
+SUMMARY: Jose OLIVEIRA 🇧🇷 - 🇳🇱 Daniel PEREZ
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-HK
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-CA
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool D
-SUMMARY: LOUNG John 🇭🇰 - 🇨🇦 Lance CRYDERMAN
+SUMMARY: Lance CRYDERMAN 🇨🇦 - 🇭🇰 LOUNG John
+LOCATION:South Paris Arena 1
+END:VEVENT
+BEGIN:VEVENT
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-SV
+DTSTAMP:20240830T183000Z
+DTSTART:20240830T183000Z
+DTEND:20240830T193000Z
+DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
+SUMMARY: Tomas KRAL 🇸🇰 - 🇰🇷 KIM Dohyun
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/AZE.ics b/docs/en/general/AZE.ics
index 226ae41d5..a09908c09 100644
--- a/docs/en/general/AZE.ics
+++ b/docs/en/general/AZE.ics
@@ -120,13 +120,12 @@ SUMMARY:Men's Shot Put - F55 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
 DTSTAMP:20240830T201400Z
 DTSTART:20240830T201400Z
 DTEND:20240830T202800Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest\n🇦🇿
-  Imamaddin KHALILOV
-SUMMARY:Men K44 -70kg Gold Medal Contest
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/BRA.ics b/docs/en/general/BRA.ics
index f0df348ad..f79c5bb2e 100644
--- a/docs/en/general/BRA.ics
+++ b/docs/en/general/BRA.ics
@@ -1170,12 +1170,12 @@ SUMMARY:Women's 400m - T47 Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-NE
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-BR
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
-SUMMARY: Daniel PEREZ 🇳🇱 - 🇧🇷 Jose OLIVEIRA
+SUMMARY: Jose OLIVEIRA 🇧🇷 - 🇳🇱 Daniel PEREZ
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/CAN.ics b/docs/en/general/CAN.ics
index 1427d6192..4136ba111 100644
--- a/docs/en/general/CAN.ics
+++ b/docs/en/general/CAN.ics
@@ -516,12 +516,12 @@ SUMMARY:Women's 100m Breaststroke - SB8 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-HK
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-CA
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool D
-SUMMARY: LOUNG John 🇭🇰 - 🇨🇦 Lance CRYDERMAN
+SUMMARY: Lance CRYDERMAN 🇨🇦 - 🇭🇰 LOUNG John
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index f7405caf0..2abfb6552 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -2118,6 +2118,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-wheelchair-tennis-WOMENS-SINGLES-FIRST-ROUND-CHN-NED
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
diff --git a/docs/en/general/FRA.ics b/docs/en/general/FRA.ics
index 551a21464..85feb66e2 100644
--- a/docs/en/general/FRA.ics
+++ b/docs/en/general/FRA.ics
@@ -1390,6 +1390,15 @@ SUMMARY: FENG/ZHOU 🇨🇳 - 🇫🇷 MERRIEN/VAUTIER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-shooting-para-sport-P2-WOMENS-10M-AIR-PISTOL-SH1-QUALI
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
diff --git a/docs/en/general/GBR.ics b/docs/en/general/GBR.ics
index 3fd3610f4..d90b358ce 100644
--- a/docs/en/general/GBR.ics
+++ b/docs/en/general/GBR.ics
@@ -1232,6 +1232,15 @@ SUMMARY:Men's C5 4000m Individual Pursuit Qualifying
 LOCATION:National Velodrome
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-wheelchair-tennis-QUAD-SINGLES-FIRST-ROUND-CHI-GBR
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
diff --git a/docs/en/general/HKG.ics b/docs/en/general/HKG.ics
index bd3e5a1e1..0c471d771 100644
--- a/docs/en/general/HKG.ics
+++ b/docs/en/general/HKG.ics
@@ -206,12 +206,12 @@ SUMMARY:Women's 200m Individual Medley - SM6 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-HK
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-CA
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool D
-SUMMARY: LOUNG John 🇭🇰 - 🇨🇦 Lance CRYDERMAN
+SUMMARY: Lance CRYDERMAN 🇨🇦 - 🇭🇰 LOUNG John
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/JPN.ics b/docs/en/general/JPN.ics
index b724ec6fe..e5b2d069b 100644
--- a/docs/en/general/JPN.ics
+++ b/docs/en/general/JPN.ics
@@ -920,6 +920,15 @@ SUMMARY:Women's 100m Breaststroke - SB8 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
+DTSTAMP:20240830T182200Z
+DTSTART:20240830T182200Z
+DTEND:20240830T183600Z
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T194000Z-boccia-MENS-INDIVIDUAL-BC3-PRELIMINARY-ROUND-POOL-D-GR
 DTSTAMP:20240830T194000Z
 DTSTART:20240830T194000Z
diff --git a/docs/en/general/KOR.ics b/docs/en/general/KOR.ics
index 6065a5e48..c4165dbf3 100644
--- a/docs/en/general/KOR.ics
+++ b/docs/en/general/KOR.ics
@@ -648,12 +648,12 @@ SUMMARY: JEONG Soyeong 🇰🇷 - 🇵🇹 Ana CORREIA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-KO
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-SV
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
-SUMMARY: KIM Dohyun 🇰🇷 - 🇸🇰 Tomas KRAL
+SUMMARY: Tomas KRAL 🇸🇰 - 🇰🇷 KIM Dohyun
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/MEX.ics b/docs/en/general/MEX.ics
index 4d9b7c436..079e72fd1 100644
--- a/docs/en/general/MEX.ics
+++ b/docs/en/general/MEX.ics
@@ -358,13 +358,12 @@ SUMMARY:Men's 400m - T52 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
 DTSTAMP:20240830T182200Z
 DTSTART:20240830T182200Z
 DTEND:20240830T183600Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests\n🇲🇽 Juan
-  Diego GARCIA LOPEZ
-SUMMARY:Men K44 -70kg Bronze Medal Contests
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/NED.ics b/docs/en/general/NED.ics
index 805e111ab..fcac2725e 100644
--- a/docs/en/general/NED.ics
+++ b/docs/en/general/NED.ics
@@ -282,12 +282,12 @@ SUMMARY: Chantal van ENGELEN 🇳🇱 - 🇮🇩 Gischa ZAYANA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-NE
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-BR
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
-SUMMARY: Daniel PEREZ 🇳🇱 - 🇧🇷 Jose OLIVEIRA
+SUMMARY: Jose OLIVEIRA 🇧🇷 - 🇳🇱 Daniel PEREZ
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/SVK.ics b/docs/en/general/SVK.ics
index 8c178cd11..4004110a8 100644
--- a/docs/en/general/SVK.ics
+++ b/docs/en/general/SVK.ics
@@ -290,12 +290,12 @@ SUMMARY: Maxime GUERIN 🇫🇷 - 🇸🇰 Marcel PAVLIK
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-KO
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-SV
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
-SUMMARY: KIM Dohyun 🇰🇷 - 🇸🇰 Tomas KRAL
+SUMMARY: Tomas KRAL 🇸🇰 - 🇰🇷 KIM Dohyun
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/THA.ics b/docs/en/general/THA.ics
index f4e98f7f2..fcefe5677 100644
--- a/docs/en/general/THA.ics
+++ b/docs/en/general/THA.ics
@@ -863,6 +863,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-shooting-para-sport-P2-WOMENS-10M-AIR-PISTOL-SH1-QUALI
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
diff --git a/docs/en/general/TUR.ics b/docs/en/general/TUR.ics
index 8e3f18e1d..971a7bcff 100644
--- a/docs/en/general/TUR.ics
+++ b/docs/en/general/TUR.ics
@@ -507,6 +507,15 @@ SUMMARY: LI Yujie 🇨🇳 - 🇹🇷 Gamze GURDAL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
+DTSTAMP:20240830T201400Z
+DTSTART:20240830T201400Z
+DTEND:20240830T202800Z
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T070000Z-para-archery-WOMENS-INDIVIDUAL-W1-18-ELIMINATION-TUR-I
 DTSTAMP:20240831T070000Z
 DTSTART:20240831T070000Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 69fee463b..eb14be0f6 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -6316,13 +6316,12 @@ SUMMARY:Women's 100m Breaststroke - SB8 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
 DTSTAMP:20240830T182200Z
 DTSTART:20240830T182200Z
 DTEND:20240830T183600Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests\n🇲🇽 Juan
-  Diego GARCIA LOPEZ
-SUMMARY:Men K44 -70kg Bronze Medal Contests
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -6344,15 +6343,6 @@ SUMMARY: Claire TAGGART 🇬🇧 - 🇵🇹 Cristina GONCALVES
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-NE
-DTSTAMP:20240830T183000Z
-DTSTART:20240830T183000Z
-DTEND:20240830T193000Z
-DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
-SUMMARY: Daniel PEREZ 🇳🇱 - 🇧🇷 Jose OLIVEIRA
-LOCATION:South Paris Arena 1
-END:VEVENT
-BEGIN:VEVENT
 UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-C-ME
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
@@ -6371,21 +6361,30 @@ SUMMARY: JEONG Soyeong 🇰🇷 - 🇵🇹 Ana CORREIA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-KO
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-A-BR
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
-DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
-SUMMARY: KIM Dohyun 🇰🇷 - 🇸🇰 Tomas KRAL
+DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool A
+SUMMARY: Jose OLIVEIRA 🇧🇷 - 🇳🇱 Daniel PEREZ
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-HK
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-D-CA
 DTSTAMP:20240830T183000Z
 DTSTART:20240830T183000Z
 DTEND:20240830T193000Z
 DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool D
-SUMMARY: LOUNG John 🇭🇰 - 🇨🇦 Lance CRYDERMAN
+SUMMARY: Lance CRYDERMAN 🇨🇦 - 🇭🇰 LOUNG John
+LOCATION:South Paris Arena 1
+END:VEVENT
+BEGIN:VEVENT
+UID:20240830T183000Z-boccia-MENS-INDIVIDUAL-BC1-PRELIMINARY-ROUND-POOL-B-SV
+DTSTAMP:20240830T183000Z
+DTSTART:20240830T183000Z
+DTEND:20240830T193000Z
+DESCRIPTION:Boccia - Men's Individual - BC1 Preliminary Round Pool B
+SUMMARY: Tomas KRAL 🇸🇰 - 🇰🇷 KIM Dohyun
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
@@ -6667,13 +6666,12 @@ SUMMARY: SETIAWAN/SADIYAH 🇮🇩 - 🇨🇳 YANG J/YANG QX
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
 DTSTAMP:20240830T201400Z
 DTSTART:20240830T201400Z
 DTEND:20240830T202800Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest\n🇦🇿
-  Imamaddin KHALILOV
-SUMMARY:Men K44 -70kg Gold Medal Contest
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -7775,6 +7773,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-para-table-tennis-WOMENS-DOUBLES-WD20-SEMIFINAL-1-TPE-
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
@@ -7784,21 +7791,12 @@ SUMMARY: LIN/TIAN 🇹🇼 - 🇵🇱 PARTYKA/PEK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
 DTEND:20240831T110000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
-SUMMARY:Men's Doubles - MD14 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T110000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
-SUMMARY:Men's Doubles - MD14 - Semifinal 2
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -7963,42 +7961,6 @@ SUMMARY: Ksenia CHASTEAU 🇫🇷 - 🇲🇦 Samira BENICHI
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-MENS-DOUBLES-FIRST-ROUND
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Men's Doubles First Round
-SUMMARY:Men's Doubles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-ORDER-OF-PLAY-AVAILABLE-EVENING-BEFO
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Order of play available evening before
-SUMMARY:Order of play available evening before
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-QUAD-SINGLES-FIRST-ROUND
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Quad Singles First Round
-SUMMARY:Quad Singles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-WOMENS-SINGLES-FIRST-ROUND
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles First Round
-SUMMARY:Women's Singles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240831T100500Z-para-archery-WOMENS-INDIVIDUAL-W1-GOLD-MEDAL
 DTSTAMP:20240831T100500Z
 DTSTART:20240831T100500Z
@@ -8324,24 +8286,6 @@ SUMMARY: PARKER/WEEKES 🇦🇺 - 🇧🇷 CARNEIRO SILVA/RODRIG
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T110000Z-wheelchair-tennis-MENS-DOUBLES-FIRST-ROUND
-DTSTAMP:20240831T110000Z
-DTSTART:20240831T110000Z
-DTEND:20240831T210000Z
-DESCRIPTION:Wheelchair Tennis - Men's Doubles First Round
-SUMMARY:Men's Doubles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T110000Z-wheelchair-tennis-WOMENS-SINGLES-FIRST-ROUND
-DTSTAMP:20240831T110000Z
-DTSTART:20240831T110000Z
-DTEND:20240831T210000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles First Round
-SUMMARY:Women's Singles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240831T110500Z-para-taekwondo-MEN-K44-80KG-QUARTERFINAL
 DTSTAMP:20240831T110500Z
 DTSTART:20240831T110500Z
diff --git a/docs/en/medals/AZE.ics b/docs/en/medals/AZE.ics
index 0ef7699aa..a8019a2a1 100644
--- a/docs/en/medals/AZE.ics
+++ b/docs/en/medals/AZE.ics
@@ -25,13 +25,12 @@ SUMMARY:Men's Shot Put - F55 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
 DTSTAMP:20240830T201400Z
 DTSTART:20240830T201400Z
 DTEND:20240830T202800Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest\n🇦🇿
-  Imamaddin KHALILOV
-SUMMARY:Men K44 -70kg Gold Medal Contest
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/medals/CHN.ics b/docs/en/medals/CHN.ics
index 7706c05f4..82de87f28 100644
--- a/docs/en/medals/CHN.ics
+++ b/docs/en/medals/CHN.ics
@@ -466,6 +466,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T110000Z-para-table-tennis-MENS-DOUBLES-MD18-SEMIFINAL-1-BRA-CH
 DTSTAMP:20240831T110000Z
 DTSTART:20240831T110000Z
diff --git a/docs/en/medals/FRA.ics b/docs/en/medals/FRA.ics
index 89b9e3c11..edb5d004a 100644
--- a/docs/en/medals/FRA.ics
+++ b/docs/en/medals/FRA.ics
@@ -175,6 +175,15 @@ SUMMARY: FENG/ZHOU 🇨🇳 - 🇫🇷 MERRIEN/VAUTIER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T170800Z-para-athletics-MENS-JAVELIN-THROW-F57-FINAL
 DTSTAMP:20240831T170800Z
 DTSTART:20240831T170800Z
diff --git a/docs/en/medals/GBR.ics b/docs/en/medals/GBR.ics
index da8a543d0..ba1236f26 100644
--- a/docs/en/medals/GBR.ics
+++ b/docs/en/medals/GBR.ics
@@ -218,6 +218,15 @@ SUMMARY:Men's 1500m - T46 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T172500Z-para-athletics-MENS-100M-T38-FINAL
 DTSTAMP:20240831T172500Z
 DTSTART:20240831T172500Z
diff --git a/docs/en/medals/JPN.ics b/docs/en/medals/JPN.ics
index f24e79306..959242699 100644
--- a/docs/en/medals/JPN.ics
+++ b/docs/en/medals/JPN.ics
@@ -134,6 +134,15 @@ SUMMARY:Women's 100m Breaststroke - SB8 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
+DTSTAMP:20240830T182200Z
+DTSTART:20240830T182200Z
+DTEND:20240830T183600Z
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T093700Z-para-athletics-WOMENS-LONG-JUMP-T64-FINAL
 DTSTAMP:20240831T093700Z
 DTSTART:20240831T093700Z
diff --git a/docs/en/medals/MEX.ics b/docs/en/medals/MEX.ics
index 3bdd4d757..1577dc096 100644
--- a/docs/en/medals/MEX.ics
+++ b/docs/en/medals/MEX.ics
@@ -111,13 +111,12 @@ SUMMARY:Men's 400m - T52 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
 DTSTAMP:20240830T182200Z
 DTSTART:20240830T182200Z
 DTEND:20240830T183600Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests\n🇲🇽 Juan
-  Diego GARCIA LOPEZ
-SUMMARY:Men K44 -70kg Bronze Medal Contests
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/THA.ics b/docs/en/medals/THA.ics
index 1bda36df7..3ee232831 100644
--- a/docs/en/medals/THA.ics
+++ b/docs/en/medals/THA.ics
@@ -60,4 +60,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Semifinal 2
 SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/medals/TUR.ics b/docs/en/medals/TUR.ics
index 1079d8bfe..4734afdda 100644
--- a/docs/en/medals/TUR.ics
+++ b/docs/en/medals/TUR.ics
@@ -49,6 +49,15 @@ SUMMARY: LI Yujie 🇨🇳 - 🇹🇷 Gamze GURDAL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
+DTSTAMP:20240830T201400Z
+DTSTART:20240830T201400Z
+DTEND:20240830T202800Z
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T080000Z-para-athletics-WOMENS-JAVELIN-THROW-F13-FINAL
 DTSTAMP:20240831T080000Z
 DTSTART:20240831T080000Z
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index d170a3f02..79c70a043 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -867,13 +867,12 @@ SUMMARY:Women's 100m Breaststroke - SB8 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
 DTSTAMP:20240830T182200Z
 DTSTART:20240830T182200Z
 DTEND:20240830T183600Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests\n🇲🇽 Juan
-  Diego GARCIA LOPEZ
-SUMMARY:Men K44 -70kg Bronze Medal Contests
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -974,13 +973,12 @@ SUMMARY: LI Yujie 🇨🇳 - 🇹🇷 Gamze GURDAL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
 DTSTAMP:20240830T201400Z
 DTSTART:20240830T201400Z
 DTEND:20240830T202800Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest\n🇦🇿
-  Imamaddin KHALILOV
-SUMMARY:Men K44 -70kg Gold Medal Contest
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -1153,6 +1151,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-para-table-tennis-WOMENS-DOUBLES-WD20-SEMIFINAL-1-TPE-
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
@@ -1162,21 +1169,12 @@ SUMMARY: LIN/TIAN 🇹🇼 - 🇵🇱 PARTYKA/PEK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
 DTEND:20240831T110000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
-SUMMARY:Men's Doubles - MD14 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T110000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
-SUMMARY:Men's Doubles - MD14 - Semifinal 2
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/CHN.ics b/docs/en/para-table-tennis/CHN.ics
index cd311265d..c4d88ef4e 100644
--- a/docs/en/para-table-tennis/CHN.ics
+++ b/docs/en/para-table-tennis/CHN.ics
@@ -347,6 +347,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T110000Z-para-table-tennis-MENS-DOUBLES-MD18-SEMIFINAL-1-BRA-CH
 DTSTAMP:20240831T110000Z
 DTSTART:20240831T110000Z
diff --git a/docs/en/para-table-tennis/FRA.ics b/docs/en/para-table-tennis/FRA.ics
index 5d58ffb9b..7022f8383 100644
--- a/docs/en/para-table-tennis/FRA.ics
+++ b/docs/en/para-table-tennis/FRA.ics
@@ -183,4 +183,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Semifinal 1
 SUMMARY: FENG/ZHOU 🇨🇳 - 🇫🇷 MERRIEN/VAUTIER
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/GBR.ics b/docs/en/para-table-tennis/GBR.ics
index 752d312b5..20c54e5f5 100644
--- a/docs/en/para-table-tennis/GBR.ics
+++ b/docs/en/para-table-tennis/GBR.ics
@@ -120,4 +120,13 @@ DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Quarterfinal 4
 SUMMARY: BAYLEY/PERRY 🇬🇧 - 🇫🇷 BERTHIER/HERRAULT
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/THA.ics b/docs/en/para-table-tennis/THA.ics
index 5794059c0..ea260e199 100644
--- a/docs/en/para-table-tennis/THA.ics
+++ b/docs/en/para-table-tennis/THA.ics
@@ -102,4 +102,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Semifinal 2
 SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/general.ics b/docs/en/para-table-tennis/general.ics
index f46ed3859..9c99cb079 100644
--- a/docs/en/para-table-tennis/general.ics
+++ b/docs/en/para-table-tennis/general.ics
@@ -1013,6 +1013,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-para-table-tennis-WOMENS-DOUBLES-WD20-SEMIFINAL-1-TPE-
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
@@ -1022,21 +1031,12 @@ SUMMARY: LIN/TIAN 🇹🇼 - 🇵🇱 PARTYKA/PEK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
 DTEND:20240831T110000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
-SUMMARY:Men's Doubles - MD14 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T110000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
-SUMMARY:Men's Doubles - MD14 - Semifinal 2
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/medals.ics b/docs/en/para-table-tennis/medals.ics
index fe71a6be8..0d00dc0f3 100644
--- a/docs/en/para-table-tennis/medals.ics
+++ b/docs/en/para-table-tennis/medals.ics
@@ -157,6 +157,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇨🇳 ZHAI/GU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2-CHN-FR
+DTSTAMP:20240831T100000Z
+DTSTART:20240831T100000Z
+DTEND:20240831T110000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
+SUMMARY: LIAO/YAN 🇨🇳 - 🇫🇷 BERTHIER/HERRAULT
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T100000Z-para-table-tennis-WOMENS-DOUBLES-WD20-SEMIFINAL-1-TPE-
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
@@ -166,21 +175,12 @@ SUMMARY: LIN/TIAN 🇹🇼 - 🇵🇱 PARTYKA/PEK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1
+UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-1-THA-GB
 DTSTAMP:20240831T100000Z
 DTSTART:20240831T100000Z
 DTEND:20240831T110000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 1
-SUMMARY:Men's Doubles - MD14 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-para-table-tennis-MENS-DOUBLES-MD14-SEMIFINAL-2
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T110000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD14 - Semifinal 2
-SUMMARY:Men's Doubles - MD14 - Semifinal 2
+SUMMARY: THAINIYOM/WANGPHONPH 🇹🇭 - 🇬🇧 KARABARDAK/SHILTON
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-taekwondo/AZE.ics b/docs/en/para-taekwondo/AZE.ics
index 52d958131..23a05138a 100644
--- a/docs/en/para-taekwondo/AZE.ics
+++ b/docs/en/para-taekwondo/AZE.ics
@@ -49,13 +49,12 @@ SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇺🇿 Javokhir ALIKULOV
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
 DTSTAMP:20240830T201400Z
 DTSTART:20240830T201400Z
 DTEND:20240830T202800Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest\n🇦🇿
-  Imamaddin KHALILOV
-SUMMARY:Men K44 -70kg Gold Medal Contest
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-taekwondo/JPN.ics b/docs/en/para-taekwondo/JPN.ics
index 3cc2c6581..7d1e6cb75 100644
--- a/docs/en/para-taekwondo/JPN.ics
+++ b/docs/en/para-taekwondo/JPN.ics
@@ -48,4 +48,13 @@ DESCRIPTION:Para Taekwondo - Men K44 -70kg Semifinal
 SUMMARY: KUDO Shunsuke 🇯🇵 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
+BEGIN:VEVENT
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
+DTSTAMP:20240830T182200Z
+DTSTART:20240830T182200Z
+DTEND:20240830T183600Z
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
+LOCATION:Grand Palais
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-taekwondo/MEX.ics b/docs/en/para-taekwondo/MEX.ics
index 24537afb6..84bafcc03 100644
--- a/docs/en/para-taekwondo/MEX.ics
+++ b/docs/en/para-taekwondo/MEX.ics
@@ -67,13 +67,12 @@ SUMMARY: Michel Ernesto SUAREZ WALKER 🇨🇺 - 🇲🇽 Juan Diego GARCIA LOPE
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
 DTSTAMP:20240830T182200Z
 DTSTART:20240830T182200Z
 DTEND:20240830T183600Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests\n🇲🇽 Juan
-  Diego GARCIA LOPEZ
-SUMMARY:Men K44 -70kg Bronze Medal Contests
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-taekwondo/TUR.ics b/docs/en/para-taekwondo/TUR.ics
index 611ed5510..71d53ec8f 100644
--- a/docs/en/para-taekwondo/TUR.ics
+++ b/docs/en/para-taekwondo/TUR.ics
@@ -176,6 +176,15 @@ SUMMARY: LI Yujie 🇨🇳 - 🇹🇷 Gamze GURDAL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
+DTSTAMP:20240830T201400Z
+DTSTART:20240830T201400Z
+DTEND:20240830T202800Z
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240831T091500Z-para-taekwondo-MEN-K44-80KG-ROUND-OF-16-TUR-SEN
 DTSTAMP:20240831T091500Z
 DTSTART:20240831T091500Z
diff --git a/docs/en/para-taekwondo/general.ics b/docs/en/para-taekwondo/general.ics
index 082d0a8e3..8a1768422 100644
--- a/docs/en/para-taekwondo/general.ics
+++ b/docs/en/para-taekwondo/general.ics
@@ -856,13 +856,12 @@ SUMMARY: Marija MICEV 🇷🇸 - 🇳🇵 Palesha GOVERDHAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
 DTSTAMP:20240830T182200Z
 DTSTART:20240830T182200Z
 DTEND:20240830T183600Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests\n🇲🇽 Juan
-  Diego GARCIA LOPEZ
-SUMMARY:Men K44 -70kg Bronze Medal Contests
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -930,13 +929,12 @@ SUMMARY: LI Yujie 🇨🇳 - 🇹🇷 Gamze GURDAL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
 DTSTAMP:20240830T201400Z
 DTSTART:20240830T201400Z
 DTEND:20240830T202800Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest\n🇦🇿
-  Imamaddin KHALILOV
-SUMMARY:Men K44 -70kg Gold Medal Contest
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-taekwondo/medals.ics b/docs/en/para-taekwondo/medals.ics
index cc4e1067e..d24fc392c 100644
--- a/docs/en/para-taekwondo/medals.ics
+++ b/docs/en/para-taekwondo/medals.ics
@@ -104,13 +104,12 @@ SUMMARY: Marija MICEV 🇷🇸 - 🇳🇵 Palesha GOVERDHAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS
+UID:20240830T182200Z-para-taekwondo-MEN-K44-70KG-BRONZE-MEDAL-CONTESTS-JPN-
 DTSTAMP:20240830T182200Z
 DTSTART:20240830T182200Z
 DTEND:20240830T183600Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests\n🇲🇽 Juan
-  Diego GARCIA LOPEZ
-SUMMARY:Men K44 -70kg Bronze Medal Contests
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Bronze Medal Contests
+SUMMARY: KUDO Shunsuke 🇯🇵 - 🇲🇽 Juan Diego GARCIA LOPEZ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -178,13 +177,12 @@ SUMMARY: LI Yujie 🇨🇳 - 🇹🇷 Gamze GURDAL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST
+UID:20240830T201400Z-para-taekwondo-MEN-K44-70KG-GOLD-MEDAL-CONTEST-AZE-TUR
 DTSTAMP:20240830T201400Z
 DTSTART:20240830T201400Z
 DTEND:20240830T202800Z
-DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest\n🇦🇿
-  Imamaddin KHALILOV
-SUMMARY:Men K44 -70kg Gold Medal Contest
+DESCRIPTION:Para Taekwondo - Men K44 -70kg Gold Medal Contest
+SUMMARY: Imamaddin KHALILOV 🇦🇿 - 🇹🇷 Fatih CELIK
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-tennis/general.ics b/docs/en/wheelchair-tennis/general.ics
index 478bc3829..f1e74cc02 100644
--- a/docs/en/wheelchair-tennis/general.ics
+++ b/docs/en/wheelchair-tennis/general.ics
@@ -346,42 +346,6 @@ SUMMARY: Ksenia CHASTEAU 🇫🇷 - 🇲🇦 Samira BENICHI
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-MENS-DOUBLES-FIRST-ROUND
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Men's Doubles First Round
-SUMMARY:Men's Doubles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-ORDER-OF-PLAY-AVAILABLE-EVENING-BEFO
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Order of play available evening before
-SUMMARY:Order of play available evening before
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-QUAD-SINGLES-FIRST-ROUND
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Quad Singles First Round
-SUMMARY:Quad Singles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T100000Z-wheelchair-tennis-WOMENS-SINGLES-FIRST-ROUND
-DTSTAMP:20240831T100000Z
-DTSTART:20240831T100000Z
-DTEND:20240831T200000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles First Round
-SUMMARY:Women's Singles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240831T110000Z-wheelchair-tennis-WOMENS-SINGLES-FIRST-ROUND-CHN-RSA
 DTSTAMP:20240831T110000Z
 DTSTART:20240831T110000Z
@@ -490,24 +454,6 @@ SUMMARY: PARKER/WEEKES 🇦🇺 - 🇧🇷 CARNEIRO SILVA/RODRIG
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240831T110000Z-wheelchair-tennis-MENS-DOUBLES-FIRST-ROUND
-DTSTAMP:20240831T110000Z
-DTSTART:20240831T110000Z
-DTEND:20240831T210000Z
-DESCRIPTION:Wheelchair Tennis - Men's Doubles First Round
-SUMMARY:Men's Doubles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240831T110000Z-wheelchair-tennis-WOMENS-SINGLES-FIRST-ROUND
-DTSTAMP:20240831T110000Z
-DTSTART:20240831T110000Z
-DTEND:20240831T210000Z
-DESCRIPTION:Wheelchair Tennis - Women's Singles First Round
-SUMMARY:Women's Singles First Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240901T100000Z-wheelchair-tennis-MENS-DOUBLES-SECOND-ROUND
 DTSTAMP:20240901T100000Z
 DTSTART:20240901T100000Z
diff --git a/docs/medals.html b/docs/medals.html
index 0b09aa5f2..9c911e19e 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -66,14 +66,29 @@
   <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">6</span>
     <span class="inline-block text-center w-1/6 flex-none">7</span>
-    <span class="inline-block text-center w-1/6 flex-none">3</span>
-    <span class="inline-block text-center w-1/6 flex-none">16</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">4</span>
+    <span class="inline-block text-center w-1/6 flex-none">19</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>YANG Guanglong</td>
+      <td>Para Swimming - Men's 100m Breaststroke - SB8 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>WEN Xiaoyan</td>
+      <td>Para Athletics - Women's 200m - T37 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>JIANG Fenfen</td>
+      <td>Para Athletics - Women's 200m - T37 Final</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>ZHANG Meng</td>
@@ -163,13 +178,18 @@
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇬🇧 Great Britain</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">5</span>
+    <span class="inline-block text-center w-1/6 flex-none">6</span>
     <span class="inline-block text-center w-1/6 flex-none">3</span>
-    <span class="inline-block text-center w-1/6 flex-none">14</span>
+    <span class="inline-block text-center w-1/6 flex-none">15</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Brock WHISTON</td>
+      <td>Para Swimming - Women's 100m Breaststroke - SB8 Final</td>
+    </tr>
     <tr>
       <td class="gold">&#9679;</td>
       <td>Maisie SUMMERS-NEWTON</td>
@@ -540,12 +560,17 @@
     <span class="inline-block flex-auto">🇨🇴 Colombia</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">0</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">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-08-30</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Carlos Daniel SERRANO ZARATE</td>
+      <td>Para Swimming - Men's 100m Breaststroke - SB8 Final</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Nelson CRISPIN CORZO</td>
@@ -590,6 +615,62 @@
   </table>
   </div>
 </div>
+<div class="collapse collapse-arrow bg-gray-100 mb-1">
+  <input type="radio" name="accordion">
+  <div class="flex collapse-title text-xl font-medium">
+    <span class="inline-block flex-auto">🇺🇦 Ukraine</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">5</span>
+    <span class="inline-block text-center w-1/6 flex-none">2</span>
+    <span class="inline-block text-center w-1/6 flex-none">8</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Nataliia KOBZAR</td>
+      <td>Para Athletics - Women's 200m - T37 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Iryna POIDA</td>
+      <td>Para Swimming - Women's 100m Freestyle - S5 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Oleksandr KOMAROV</td>
+      <td>Para Swimming - Men's 100m Freestyle - S5 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Vladyslav BILYI</td>
+      <td>Para Athletics - Men's Javelin Throw - F38 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Iryna POIDA</td>
+      <td>Para Swimming - Women's 200m Freestyle - S5 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Oleksandr KOMAROV</td>
+      <td>Para Swimming - Men's 200m Freestyle - S5 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Anna HONTAR</td>
+      <td>Para Swimming - Women's 50m Freestyle - S6 Final</td>
+    </tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Anton KOL</td>
+      <td>Para Swimming - Men's 100m Backstroke - S1 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">
@@ -636,57 +717,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">🇺🇦 Ukraine</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>
-    <span class="inline-block text-center w-1/6 flex-none">2</span>
-    <span class="inline-block text-center w-1/6 flex-none">7</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Iryna POIDA</td>
-      <td>Para Swimming - Women's 100m Freestyle - S5 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Oleksandr KOMAROV</td>
-      <td>Para Swimming - Men's 100m Freestyle - S5 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Vladyslav BILYI</td>
-      <td>Para Athletics - Men's Javelin Throw - F38 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Iryna POIDA</td>
-      <td>Para Swimming - Women's 200m Freestyle - S5 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Oleksandr KOMAROV</td>
-      <td>Para Swimming - Men's 200m Freestyle - S5 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Anna HONTAR</td>
-      <td>Para Swimming - Women's 50m Freestyle - S6 Final</td>
-    </tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Anton KOL</td>
-      <td>Para Swimming - Men's 100m Backstroke - S1 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">
@@ -864,6 +894,52 @@
   </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">🇪🇸 Spain</span>
+    <span class="inline-block text-center w-1/6 flex-none">1</span>
+    <span class="inline-block text-center w-1/6 flex-none">0</span>
+    <span class="inline-block text-center w-1/6 flex-none">5</span>
+    <span class="inline-block text-center w-1/6 flex-none">6</span>
+  </div>
+  <div class="collapse-content">
+  <table class="table-full">
+    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Anastasiya DMYTRIV DMYTRIV</td>
+      <td>Para Swimming - Women's 100m Breaststroke - SB8 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Alfonso CABELLO LLAMAS</td>
+      <td>Para Cycling Track - Men's C4-5 1000m Time Trial - Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Alba GARCIA FALAGAN</td>
+      <td>Para Athletics - Women's Long Jump - T11 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Enrique Jose ALHAMBRA MOLLAR</td>
+      <td>Para Swimming - Men's 100m Butterfly - S13 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Miguel LUQUE</td>
+      <td>Para Swimming - Men's 50m Breaststroke - SB3 Final</td>
+    </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Ricardo TEN ARGILES</td>
+      <td>Para Cycling Track - Men's C1 3000m Individual Pursuit Final - Bronze</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -1206,47 +1282,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">🇪🇸 Spain</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">0</span>
-    <span class="inline-block text-center w-1/6 flex-none">5</span>
-    <span class="inline-block text-center w-1/6 flex-none">5</span>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-08-30</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Alfonso CABELLO LLAMAS</td>
-      <td>Para Cycling Track - Men's C4-5 1000m Time Trial - Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Alba GARCIA FALAGAN</td>
-      <td>Para Athletics - Women's Long Jump - T11 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-08-29</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Enrique Jose ALHAMBRA MOLLAR</td>
-      <td>Para Swimming - Men's 100m Butterfly - S13 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Miguel LUQUE</td>
-      <td>Para Swimming - Men's 50m Breaststroke - SB3 Final</td>
-    </tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Ricardo TEN ARGILES</td>
-      <td>Para Cycling Track - Men's C1 3000m Individual Pursuit Final - Bronze</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
diff --git a/docs/today.html b/docs/today.html
index 47b6435b4..233084429 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -13950,7 +13950,7 @@
     <div class="competitor JPN">🇯🇵 UTSUGI Mikuni </div>
  </div>
 </div>
-<div class="event py-4 bg-orange-700" data-start="20240830T182200Z" data-end="20240830T183600Z" data-noc="MEX" >
+<div class="event py-4 bg-orange-700" data-start="20240830T182200Z" data-end="20240830T183600Z" data-noc="JPN,MEX" >
  <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>
@@ -13962,7 +13962,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men K44 -70kg Bronze Medal Contests</div>
-    <div class="competitor MEX">🇲🇽 Juan Diego GARCIA LOPEZ </div>
+    <div class="competitors">
+      KUDO Shunsuke
+      🇯🇵
+      -
+      🇲🇽
+      Juan Diego GARCIA LOPEZ
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240830T183000Z" data-end="20240830T193000Z" data-noc="INA,NED" >
@@ -14007,27 +14013,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240830T183000Z" data-end="20240830T193000Z" data-noc="BRA,NED" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <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">
-   
-   BOCCIA
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Individual - BC1 Preliminary Round Pool A</div>
-    <div class="competitors">
-      Daniel PEREZ
-      🇳🇱
-      -
-      🇧🇷
-      Jose OLIVEIRA
-    </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240830T183000Z" data-end="20240830T193000Z" data-noc="KOR,MEX" >
  <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>
@@ -14070,7 +14055,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240830T183000Z" data-end="20240830T193000Z" data-noc="KOR,SVK" >
+<div class="event py-4 " data-start="20240830T183000Z" data-end="20240830T193000Z" data-noc="BRA,NED" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -14081,13 +14066,13 @@
    BOCCIA
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div>Men's Individual - BC1 Preliminary Round Pool B</div>
+   <div>Men's Individual - BC1 Preliminary Round Pool A</div>
     <div class="competitors">
-      KIM Dohyun
-      🇰🇷
+      Jose OLIVEIRA
+      🇧🇷
       -
-      🇸🇰
-      Tomas KRAL
+      🇳🇱
+      Daniel PEREZ
     </div>
  </div>
 </div>
@@ -14104,11 +14089,32 @@
    </div>
    <div>Men's Individual - BC1 Preliminary Round Pool D</div>
     <div class="competitors">
-      LOUNG John
-      🇭🇰
-      -
-      🇨🇦
       Lance CRYDERMAN
+      🇨🇦
+      -
+      🇭🇰
+      LOUNG John
+    </div>
+ </div>
+</div>
+<div class="event py-4 " data-start="20240830T183000Z" data-end="20240830T193000Z" data-noc="KOR,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>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   BOCCIA
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Individual - BC1 Preliminary Round Pool B</div>
+    <div class="competitors">
+      Tomas KRAL
+      🇸🇰
+      -
+      🇰🇷
+      KIM Dohyun
     </div>
  </div>
 </div>
@@ -14720,7 +14726,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 bg-amber-400" data-start="20240830T201400Z" data-end="20240830T202800Z" data-noc="AZE" >
+<div class="event py-4 bg-amber-400" data-start="20240830T201400Z" data-end="20240830T202800Z" data-noc="AZE,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>
@@ -14732,7 +14738,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men K44 -70kg Gold Medal Contest</div>
-    <div class="competitor AZE">🇦🇿 Imamaddin KHALILOV </div>
+    <div class="competitors">
+      Imamaddin KHALILOV
+      🇦🇿
+      -
+      🇹🇷
+      Fatih CELIK
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240830T202800Z" data-end="20240830T204200Z" data-noc="FRA" >
@@ -17021,6 +17033,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 bg-amber-400" data-start="20240831T100000Z" data-end="20240831T110000Z" 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>
+  <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 Doubles - MD14 - Semifinal 2</div>
+    <div class="competitors">
+      LIAO/YAN
+      🇨🇳
+      -
+      🇫🇷
+      BERTHIER/HERRAULT
+    </div>
+ </div>
+</div>
 <div class="event py-4 bg-amber-400" data-start="20240831T100000Z" data-end="20240831T110000Z" data-noc="POL,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>
@@ -17042,7 +17075,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 bg-amber-400" data-start="20240831T100000Z" data-end="20240831T110000Z" data-noc="" >
+<div class="event py-4 bg-amber-400" data-start="20240831T100000Z" data-end="20240831T110000Z" 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>
@@ -17054,20 +17087,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Doubles - MD14 - Semifinal 1</div>
- </div>
-</div>
-<div class="event py-4 bg-amber-400" data-start="20240831T100000Z" data-end="20240831T110000Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   🏅
-   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 Doubles - MD14 - Semifinal 2</div>
+    <div class="competitors">
+      THAINIYOM/WANGPHONPH
+      🇹🇭
+      -
+      🇬🇧
+      KARABARDAK/SHILTON
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240831T100000Z" data-end="20240831T111500Z" data-noc="AZE,CRC,CUB,FRA,HUN,IND,IRI,IRQ,KAZ,KOR,LAT,LTU,MKD,NZL,THA,TUR,UKR,UZB" >
@@ -17437,58 +17463,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240831T100000Z" data-end="20240831T200000Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Men's Doubles First Round</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240831T100000Z" data-end="20240831T200000Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Order of play available evening before</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240831T100000Z" data-end="20240831T200000Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Quad Singles First Round</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240831T100000Z" data-end="20240831T200000Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Women's Singles First Round</div>
- </div>
-</div>
 <div class="event py-4 bg-amber-400" data-start="20240831T100500Z" data-end="20240831T102200Z" data-noc="" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -18182,32 +18156,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240831T110000Z" data-end="20240831T210000Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Men's Doubles First Round</div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240831T110000Z" data-end="20240831T210000Z" data-noc="" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR TENNIS
-   </div>
-   <div>Women's Singles First Round</div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240831T110500Z" data-end="20240831T111600Z" data-noc="MEX" >
  <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>