diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index d874f45d1..9bc7473f5 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -583,6 +583,15 @@ SUMMARY: SUBHAN/MARLINA 🇮🇩 - 🇨🇳 LIN/LI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2-CHN-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
+SUMMARY: CAO/FENG 🇨🇳 - 🇫🇷 MARTIN/THOMAS
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T180000Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
 DTSTAMP:20240829T180000Z
 DTSTART:20240829T180000Z
@@ -623,6 +632,15 @@ SUMMARY: David TOUPE 🇫🇷 - 🇨🇳 YANG Tong
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4-CHN-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 4
+SUMMARY: LIU/ZHAI 🇨🇳 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T184600Z-para-swimming-WOMENS-200M-FREESTYLE-S5-FINAL
 DTSTAMP:20240829T184600Z
 DTSTART:20240829T184600Z
diff --git a/docs/en/general/FRA.ics b/docs/en/general/FRA.ics
index e687e2877..0af42c573 100644
--- a/docs/en/general/FRA.ics
+++ b/docs/en/general/FRA.ics
@@ -496,6 +496,15 @@ SUMMARY:Women's 50m Freestyle - S10 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2-CHN-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
+SUMMARY: CAO/FENG 🇨🇳 - 🇫🇷 MARTIN/THOMAS
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T180000Z-sitting-volleyball-MENS-PRELIMINARY-ROUND-POOL-A-FRA-K
 DTSTAMP:20240829T180000Z
 DTSTART:20240829T180000Z
diff --git a/docs/en/general/GBR.ics b/docs/en/general/GBR.ics
index 5903a5033..15cb93e94 100644
--- a/docs/en/general/GBR.ics
+++ b/docs/en/general/GBR.ics
@@ -404,6 +404,15 @@ SUMMARY: Evelyn OLIVEIRA 🇧🇷 - 🇬🇧 Sally KIDSON
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-GBR-P
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16
+SUMMARY: STACEY/TWOMEY 🇬🇧 - 🇵🇱 CHOJNOWSKI/MARSZAL
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T184600Z-para-swimming-WOMENS-200M-FREESTYLE-S5-FINAL
 DTSTAMP:20240829T184600Z
 DTSTART:20240829T184600Z
diff --git a/docs/en/general/GER.ics b/docs/en/general/GER.ics
index e890754c4..59fb1b2fb 100644
--- a/docs/en/general/GER.ics
+++ b/docs/en/general/GER.ics
@@ -257,6 +257,15 @@ SUMMARY: JPN 🇯🇵 - 🇩🇪 GER
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4-CHN-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 4
+SUMMARY: LIU/ZHAI 🇨🇳 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T184600Z-para-swimming-WOMENS-200M-FREESTYLE-S5-FINAL
 DTSTAMP:20240829T184600Z
 DTSTART:20240829T184600Z
diff --git a/docs/en/general/JPN.ics b/docs/en/general/JPN.ics
index ef8a7fe19..55c58045b 100644
--- a/docs/en/general/JPN.ics
+++ b/docs/en/general/JPN.ics
@@ -435,6 +435,15 @@ SUMMARY: JPN 🇯🇵 - 🇩🇪 GER
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1-THA-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
+SUMMARY: CHAIWUT/GLINBANCHE 🇹🇭 - 🇯🇵 SAITO/SHICHINO
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T183000Z-boccia-WOMENS-INDIVIDUAL-BC3-PRELIMINARY-ROUND-POOL-D-
 DTSTAMP:20240829T183000Z
 DTSTART:20240829T183000Z
diff --git a/docs/en/general/KOR.ics b/docs/en/general/KOR.ics
index a28592f58..d8ecb1dea 100644
--- a/docs/en/general/KOR.ics
+++ b/docs/en/general/KOR.ics
@@ -287,6 +287,15 @@ SUMMARY: Jamieson LEESON 🇦🇺 - 🇰🇷 KANG Sunhee
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3-KOR-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 3
+SUMMARY: KIM/KIM 🇰🇷 - 🇹🇷 OZTURK/TURAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T070000Z-shooting-para-sport-R2-WOMENS-10M-AIR-RIFLE-STANDING-S
 DTSTAMP:20240830T070000Z
 DTSTART:20240830T070000Z
diff --git a/docs/en/general/POL.ics b/docs/en/general/POL.ics
index bb5fffcbf..53377da43 100644
--- a/docs/en/general/POL.ics
+++ b/docs/en/general/POL.ics
@@ -264,13 +264,12 @@ SUMMARY: Ladamanee KLA-HAN 🇹🇭 - 🇵🇱 Edyta OWCZARZ
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
+UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-GBR-P
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16\n🇵🇱
-  CHOJNOWSKI/MARSZAL
-SUMMARY:Mixed Doubles - XD17 - Round of 16
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16
+SUMMARY: STACEY/TWOMEY 🇬🇧 - 🇵🇱 CHOJNOWSKI/MARSZAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/SVK.ics b/docs/en/general/SVK.ics
index a67c9e63a..26a85d3ae 100644
--- a/docs/en/general/SVK.ics
+++ b/docs/en/general/SVK.ics
@@ -115,6 +115,15 @@ SUMMARY:Men's Individual Compound Open Ranking Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16-SVK-TU
+DTSTAMP:20240829T154500Z
+DTSTART:20240829T154500Z
+DTEND:20240829T163000Z
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
+SUMMARY: TRAVNICEK/KANOVA 🇸🇰 - 🇹🇷 OZTURK/DUMAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T161000Z-boccia-WOMENS-INDIVIDUAL-BC2-PRELIMINARY-ROUND-POOL-B-
 DTSTAMP:20240829T161000Z
 DTSTART:20240829T161000Z
diff --git a/docs/en/general/THA.ics b/docs/en/general/THA.ics
index ade224293..560a365fa 100644
--- a/docs/en/general/THA.ics
+++ b/docs/en/general/THA.ics
@@ -345,6 +345,15 @@ SUMMARY: SETIAWAN/SADIYAH 🇮🇩 - 🇹🇭 TEAMARROM/SEANSUPA
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1-THA-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
+SUMMARY: CHAIWUT/GLINBANCHE 🇹🇭 - 🇯🇵 SAITO/SHICHINO
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T183000Z-boccia-WOMENS-INDIVIDUAL-BC3-PRELIMINARY-ROUND-POOL-A-
 DTSTAMP:20240829T183000Z
 DTSTART:20240829T183000Z
diff --git a/docs/en/general/TUR.ics b/docs/en/general/TUR.ics
index bc4500d4a..251a942e8 100644
--- a/docs/en/general/TUR.ics
+++ b/docs/en/general/TUR.ics
@@ -205,13 +205,12 @@ SUMMARY:Women K44 -47kg Repechage
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16
+UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16-SVK-TU
 DTSTAMP:20240829T154500Z
 DTSTART:20240829T154500Z
 DTEND:20240829T163000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16\n🇹🇷
-  OZTURK/DUMAN
-SUMMARY:Mixed Doubles - XD7 - Round of 16
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
+SUMMARY: TRAVNICEK/KANOVA 🇸🇰 - 🇹🇷 OZTURK/DUMAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -233,6 +232,15 @@ SUMMARY: Sabir ZEYNALOV 🇦🇿 - 🇹🇷 Ali Can OZCAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3-KOR-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 3
+SUMMARY: KIM/KIM 🇰🇷 - 🇹🇷 OZTURK/TURAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T070000Z-shooting-para-sport-R2-WOMENS-10M-AIR-RIFLE-STANDING-S
 DTSTAMP:20240830T070000Z
 DTSTART:20240830T070000Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 411416d2d..353b4214e 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -2097,13 +2097,12 @@ SUMMARY: TORRES/PEREZ 🇨🇱 - 🇫🇷 DIDIER/KAMKASOMPH
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16
+UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16-SVK-TU
 DTSTAMP:20240829T154500Z
 DTSTART:20240829T154500Z
 DTEND:20240829T163000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16\n🇹🇷
-  OZTURK/DUMAN
-SUMMARY:Mixed Doubles - XD7 - Round of 16
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
+SUMMARY: TRAVNICEK/KANOVA 🇸🇰 - 🇹🇷 OZTURK/DUMAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -2710,6 +2709,24 @@ SUMMARY: SUBHAN/MARLINA 🇮🇩 - 🇨🇳 LIN/LI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2-CHN-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
+SUMMARY: CAO/FENG 🇨🇳 - 🇫🇷 MARTIN/THOMAS
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1-THA-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
+SUMMARY: CHAIWUT/GLINBANCHE 🇹🇭 - 🇯🇵 SAITO/SHICHINO
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T180000Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-POL-U
 DTSTAMP:20240829T180000Z
 DTSTART:20240829T180000Z
@@ -2719,24 +2736,6 @@ SUMMARY: GRUDZIEN/PEK 🇵🇱 - 🇺🇦 MAI/LYTOVCHENK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1
-DTSTAMP:20240829T180000Z
-DTSTART:20240829T180000Z
-DTEND:20240829T184500Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2
-DTSTAMP:20240829T180000Z
-DTSTART:20240829T180000Z
-DTEND:20240829T184500Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 2
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240829T180000Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
 DTSTAMP:20240829T180000Z
 DTSTART:20240829T180000Z
@@ -2918,21 +2917,30 @@ SUMMARY: KRAJEWSKI/SIMON 🇺🇸 - 🇹🇭 MEECHAI/SAEYANG
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3-KOR-
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 3
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 3
+SUMMARY: KIM/KIM 🇰🇷 - 🇹🇷 OZTURK/TURAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4-CHN-
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 4
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 4
+SUMMARY: LIU/ZHAI 🇨🇳 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-GBR-P
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16
+SUMMARY: STACEY/TWOMEY 🇬🇧 - 🇵🇱 CHOJNOWSKI/MARSZAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -2950,16 +2958,6 @@ UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16\n🇵🇱
-  CHOJNOWSKI/MARSZAL
-SUMMARY:Mixed Doubles - XD17 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
-DTSTAMP:20240829T184500Z
-DTSTART:20240829T184500Z
-DTEND:20240829T193000Z
 DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16\n🇺🇦
   DIDUKH/SHYNKAROVA
 SUMMARY:Mixed Doubles - XD17 - Round of 16
@@ -16636,12 +16634,12 @@ SUMMARY:Men's up to 65kg Final
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T164500Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
+UID:20240905T164500Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
 DTSTAMP:20240905T164500Z
 DTSTART:20240905T164500Z
 DTEND:20240905T180000Z
-DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
-SUMMARY:Women's Foil Team Gold Medal Match
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
+SUMMARY:Men's Foil Team Bronze Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -16798,12 +16796,12 @@ SUMMARY:Men's Semi-final
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T180000Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
+UID:20240905T180000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
 DTSTAMP:20240905T180000Z
 DTSTART:20240905T180000Z
 DTEND:20240905T191500Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
-SUMMARY:Men's Foil Team Bronze Medal Match
+DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
+SUMMARY:Women's Foil Team Gold Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -17925,12 +17923,12 @@ SUMMARY:Women's 100m Backstroke - S10 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T163000Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
+UID:20240906T163000Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
 DTSTAMP:20240906T163000Z
 DTSTART:20240906T163000Z
 DTEND:20240906T170500Z
-DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
-SUMMARY:Women's Épée Category A Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
+SUMMARY:Men's Épée Category B Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -17997,12 +17995,12 @@ SUMMARY:Men's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T170500Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
+UID:20240906T170500Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
 DTSTAMP:20240906T170500Z
 DTSTART:20240906T170500Z
 DTEND:20240906T174000Z
-DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
-SUMMARY:Men's Épée Category B Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
+SUMMARY:Women's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index 15b9f4c98..63bee3b68 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -4417,12 +4417,12 @@ SUMMARY:Men's up to 65kg Final
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T164500Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
+UID:20240905T164500Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
 DTSTAMP:20240905T164500Z
 DTSTART:20240905T164500Z
 DTEND:20240905T180000Z
-DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
-SUMMARY:Women's Foil Team Gold Medal Match
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
+SUMMARY:Men's Foil Team Bronze Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -4570,12 +4570,12 @@ SUMMARY:Women's 50m Freestyle - S8 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T180000Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
+UID:20240905T180000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
 DTSTAMP:20240905T180000Z
 DTSTART:20240905T180000Z
 DTEND:20240905T191500Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
-SUMMARY:Men's Foil Team Bronze Medal Match
+DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
+SUMMARY:Women's Foil Team Gold Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -5032,12 +5032,12 @@ SUMMARY:Women's 100m Backstroke - S10 Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T163000Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
+UID:20240906T163000Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
 DTSTAMP:20240906T163000Z
 DTSTART:20240906T163000Z
 DTEND:20240906T170500Z
-DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
-SUMMARY:Women's Épée Category A Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
+SUMMARY:Men's Épée Category B Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -5104,12 +5104,12 @@ SUMMARY:Men's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T170500Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
+UID:20240906T170500Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
 DTSTAMP:20240906T170500Z
 DTSTART:20240906T170500Z
 DTEND:20240906T174000Z
-DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
-SUMMARY:Men's Épée Category B Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
+SUMMARY:Women's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/CHN.ics b/docs/en/para-table-tennis/CHN.ics
index 8119064fa..83b8223b7 100644
--- a/docs/en/para-table-tennis/CHN.ics
+++ b/docs/en/para-table-tennis/CHN.ics
@@ -123,6 +123,15 @@ SUMMARY:Mixed Doubles - XD7 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2-CHN-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
+SUMMARY: CAO/FENG 🇨🇳 - 🇫🇷 MARTIN/THOMAS
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T180000Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
 DTSTAMP:20240829T180000Z
 DTSTART:20240829T180000Z
@@ -142,4 +151,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16\n🇨🇳
 SUMMARY:Mixed Doubles - XD17 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4-CHN-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 4
+SUMMARY: LIU/ZHAI 🇨🇳 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/FRA.ics b/docs/en/para-table-tennis/FRA.ics
index 103dd24cc..f0bb33d67 100644
--- a/docs/en/para-table-tennis/FRA.ics
+++ b/docs/en/para-table-tennis/FRA.ics
@@ -103,4 +103,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16\n🇫🇷
 SUMMARY:Mixed Doubles - XD7 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2-CHN-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
+SUMMARY: CAO/FENG 🇨🇳 - 🇫🇷 MARTIN/THOMAS
+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 04c201ec7..1b25f3a8f 100644
--- a/docs/en/para-table-tennis/GBR.ics
+++ b/docs/en/para-table-tennis/GBR.ics
@@ -75,4 +75,13 @@ DESCRIPTION:Para Table Tennis - Women's Doubles - WD14 - Semifinal 2
 SUMMARY: HUANG/JIN 🇨🇳 - 🇬🇧 PICKARD/TWOMEY
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-GBR-P
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16
+SUMMARY: STACEY/TWOMEY 🇬🇧 - 🇵🇱 CHOJNOWSKI/MARSZAL
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/GER.ics b/docs/en/para-table-tennis/GER.ics
index 6f1885225..9c9ff5893 100644
--- a/docs/en/para-table-tennis/GER.ics
+++ b/docs/en/para-table-tennis/GER.ics
@@ -85,4 +85,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16\n🇩🇪
 SUMMARY:Mixed Doubles - XD7 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4-CHN-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 4
+SUMMARY: LIU/ZHAI 🇨🇳 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/JPN.ics b/docs/en/para-table-tennis/JPN.ics
index 8a3c96749..ec686bb7d 100644
--- a/docs/en/para-table-tennis/JPN.ics
+++ b/docs/en/para-table-tennis/JPN.ics
@@ -30,4 +30,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 32
 SUMMARY: IWABUCHI/TOMONO 🇯🇵 - 🇷🇴 SIMION/CIRIPAN
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1-THA-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
+SUMMARY: CHAIWUT/GLINBANCHE 🇹🇭 - 🇯🇵 SAITO/SHICHINO
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/KOR.ics b/docs/en/para-table-tennis/KOR.ics
index 7e4ec3c09..abc85dbdd 100644
--- a/docs/en/para-table-tennis/KOR.ics
+++ b/docs/en/para-table-tennis/KOR.ics
@@ -57,4 +57,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
 SUMMARY: ROMERO/GARRONE 🇦🇷 - 🇰🇷 KIM/YOON
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3-KOR-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 3
+SUMMARY: KIM/KIM 🇰🇷 - 🇹🇷 OZTURK/TURAN
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/POL.ics b/docs/en/para-table-tennis/POL.ics
index d0f7008b1..a310600d3 100644
--- a/docs/en/para-table-tennis/POL.ics
+++ b/docs/en/para-table-tennis/POL.ics
@@ -58,13 +58,12 @@ SUMMARY: GRUDZIEN/PEK 🇵🇱 - 🇺🇦 MAI/LYTOVCHENK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
+UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-GBR-P
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16\n🇵🇱
-  CHOJNOWSKI/MARSZAL
-SUMMARY:Mixed Doubles - XD17 - Round of 16
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16
+SUMMARY: STACEY/TWOMEY 🇬🇧 - 🇵🇱 CHOJNOWSKI/MARSZAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/SVK.ics b/docs/en/para-table-tennis/SVK.ics
index c4984688c..67cf046f2 100644
--- a/docs/en/para-table-tennis/SVK.ics
+++ b/docs/en/para-table-tennis/SVK.ics
@@ -30,4 +30,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 32
 SUMMARY: TRAVNICEK/KANOVA 🇸🇰 - 🇪🇬 RAMADAN/ELSHAMY
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16-SVK-TU
+DTSTAMP:20240829T154500Z
+DTSTART:20240829T154500Z
+DTEND:20240829T163000Z
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
+SUMMARY: TRAVNICEK/KANOVA 🇸🇰 - 🇹🇷 OZTURK/DUMAN
+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 ebe10bdfe..069c4c37e 100644
--- a/docs/en/para-table-tennis/THA.ics
+++ b/docs/en/para-table-tennis/THA.ics
@@ -48,4 +48,13 @@ DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
 SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇫🇷 LAMIRAULT/SAINT-PIER
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1-THA-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
+SUMMARY: CHAIWUT/GLINBANCHE 🇹🇭 - 🇯🇵 SAITO/SHICHINO
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/TUR.ics b/docs/en/para-table-tennis/TUR.ics
index 46b0c829b..53d4f4bf0 100644
--- a/docs/en/para-table-tennis/TUR.ics
+++ b/docs/en/para-table-tennis/TUR.ics
@@ -22,13 +22,21 @@ SUMMARY: HANDEN/SAND 🇸🇪 - 🇹🇷 DEMIR/KAVAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16
+UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16-SVK-TU
 DTSTAMP:20240829T154500Z
 DTSTART:20240829T154500Z
 DTEND:20240829T163000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16\n🇹🇷
-  OZTURK/DUMAN
-SUMMARY:Mixed Doubles - XD7 - Round of 16
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
+SUMMARY: TRAVNICEK/KANOVA 🇸🇰 - 🇹🇷 OZTURK/DUMAN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3-KOR-
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 3
+SUMMARY: KIM/KIM 🇰🇷 - 🇹🇷 OZTURK/TURAN
 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 92b453145..9b95c4c23 100644
--- a/docs/en/para-table-tennis/general.ics
+++ b/docs/en/para-table-tennis/general.ics
@@ -464,13 +464,12 @@ SUMMARY: TORRES/PEREZ 🇨🇱 - 🇫🇷 DIDIER/KAMKASOMPH
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16
+UID:20240829T154500Z-para-table-tennis-MIXED-DOUBLES-XD7-ROUND-OF-16-SVK-TU
 DTSTAMP:20240829T154500Z
 DTSTART:20240829T154500Z
 DTEND:20240829T163000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16\n🇹🇷
-  OZTURK/DUMAN
-SUMMARY:Mixed Doubles - XD7 - Round of 16
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD7 - Round of 16
+SUMMARY: TRAVNICEK/KANOVA 🇸🇰 - 🇹🇷 OZTURK/DUMAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -569,6 +568,24 @@ SUMMARY:Mixed Doubles - XD7 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2-CHN-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
+SUMMARY: CAO/FENG 🇨🇳 - 🇫🇷 MARTIN/THOMAS
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1-THA-
+DTSTAMP:20240829T180000Z
+DTSTART:20240829T180000Z
+DTEND:20240829T184500Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
+SUMMARY: CHAIWUT/GLINBANCHE 🇹🇭 - 🇯🇵 SAITO/SHICHINO
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240829T180000Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-POL-U
 DTSTAMP:20240829T180000Z
 DTSTART:20240829T180000Z
@@ -578,24 +595,6 @@ SUMMARY: GRUDZIEN/PEK 🇵🇱 - 🇺🇦 MAI/LYTOVCHENK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-1
-DTSTAMP:20240829T180000Z
-DTSTART:20240829T180000Z
-DTEND:20240829T184500Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 1
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240829T180000Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-2
-DTSTAMP:20240829T180000Z
-DTSTART:20240829T180000Z
-DTEND:20240829T184500Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 2
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 2
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240829T180000Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
 DTSTAMP:20240829T180000Z
 DTSTART:20240829T180000Z
@@ -616,21 +615,30 @@ SUMMARY:Mixed Doubles - XD17 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-3-KOR-
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 3
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 3
+SUMMARY: KIM/KIM 🇰🇷 - 🇹🇷 OZTURK/TURAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4
+UID:20240829T184500Z-para-table-tennis-MENS-DOUBLES-MD8-QUARTERFINAL-4-CHN-
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
 DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Quarterfinal 4
-SUMMARY:Men's Doubles - MD8 - Quarterfinal 4
+SUMMARY: LIU/ZHAI 🇨🇳 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
+UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16-GBR-P
+DTSTAMP:20240829T184500Z
+DTSTART:20240829T184500Z
+DTEND:20240829T193000Z
+DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16
+SUMMARY: STACEY/TWOMEY 🇬🇧 - 🇵🇱 CHOJNOWSKI/MARSZAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -648,16 +656,6 @@ UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
 DTSTAMP:20240829T184500Z
 DTSTART:20240829T184500Z
 DTEND:20240829T193000Z
-DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16\n🇵🇱
-  CHOJNOWSKI/MARSZAL
-SUMMARY:Mixed Doubles - XD17 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240829T184500Z-para-table-tennis-MIXED-DOUBLES-XD17-ROUND-OF-16
-DTSTAMP:20240829T184500Z
-DTSTART:20240829T184500Z
-DTEND:20240829T193000Z
 DESCRIPTION:Para Table Tennis - Mixed Doubles - XD17 - Round of 16\n🇺🇦
   DIDUKH/SHYNKAROVA
 SUMMARY:Mixed Doubles - XD17 - Round of 16
diff --git a/docs/en/wheelchair-fencing/general.ics b/docs/en/wheelchair-fencing/general.ics
index 19f09d3ad..12f46a345 100644
--- a/docs/en/wheelchair-fencing/general.ics
+++ b/docs/en/wheelchair-fencing/general.ics
@@ -571,21 +571,21 @@ SUMMARY:Women's Foil Team Bronze Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T164500Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
+UID:20240905T164500Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
 DTSTAMP:20240905T164500Z
 DTSTART:20240905T164500Z
 DTEND:20240905T180000Z
-DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
-SUMMARY:Women's Foil Team Gold Medal Match
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
+SUMMARY:Men's Foil Team Bronze Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T180000Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
+UID:20240905T180000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
 DTSTAMP:20240905T180000Z
 DTSTART:20240905T180000Z
 DTEND:20240905T191500Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
-SUMMARY:Men's Foil Team Bronze Medal Match
+DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
+SUMMARY:Women's Foil Team Gold Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -778,12 +778,12 @@ SUMMARY:Women's Épée Category A Semifinals
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T163000Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
+UID:20240906T163000Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
 DTSTAMP:20240906T163000Z
 DTSTART:20240906T163000Z
 DTEND:20240906T170500Z
-DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
-SUMMARY:Women's Épée Category A Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
+SUMMARY:Men's Épée Category B Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -805,12 +805,12 @@ SUMMARY:Men's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T170500Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
+UID:20240906T170500Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
 DTSTAMP:20240906T170500Z
 DTSTART:20240906T170500Z
 DTEND:20240906T174000Z
-DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
-SUMMARY:Men's Épée Category B Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
+SUMMARY:Women's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/medals.ics b/docs/en/wheelchair-fencing/medals.ics
index c164928ce..47c4c2c2e 100644
--- a/docs/en/wheelchair-fencing/medals.ics
+++ b/docs/en/wheelchair-fencing/medals.ics
@@ -157,21 +157,21 @@ SUMMARY:Women's Foil Team Bronze Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T164500Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
+UID:20240905T164500Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
 DTSTAMP:20240905T164500Z
 DTSTART:20240905T164500Z
 DTEND:20240905T180000Z
-DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
-SUMMARY:Women's Foil Team Gold Medal Match
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
+SUMMARY:Men's Foil Team Bronze Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T180000Z-wheelchair-fencing-MENS-FOIL-TEAM-BRONZE-MEDAL-MATCH
+UID:20240905T180000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-GOLD-MEDAL-MATCH
 DTSTAMP:20240905T180000Z
 DTSTART:20240905T180000Z
 DTEND:20240905T191500Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Bronze Medal Match
-SUMMARY:Men's Foil Team Bronze Medal Match
+DESCRIPTION:Wheelchair Fencing - Women's Foil Team Gold Medal Match
+SUMMARY:Women's Foil Team Gold Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -184,12 +184,12 @@ SUMMARY:Men's Foil Team Gold Medal Match
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T163000Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
+UID:20240906T163000Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
 DTSTAMP:20240906T163000Z
 DTSTART:20240906T163000Z
 DTEND:20240906T170500Z
-DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
-SUMMARY:Women's Épée Category A Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
+SUMMARY:Men's Épée Category B Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -211,12 +211,12 @@ SUMMARY:Men's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T170500Z-wheelchair-fencing-MENS-PE-CATEGORY-B-BRONZE-MEDAL-BOU
+UID:20240906T170500Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-BRONZE-MEDAL-B
 DTSTAMP:20240906T170500Z
 DTSTART:20240906T170500Z
 DTEND:20240906T174000Z
-DESCRIPTION:Wheelchair Fencing - Men's Épée Category B Bronze Medal Bout
-SUMMARY:Men's Épée Category B Bronze Medal Bout
+DESCRIPTION:Wheelchair Fencing - Women's Épée Category A Bronze Medal Bout
+SUMMARY:Women's Épée Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index d6d2473b6..d3da9279d 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -4603,7 +4603,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240829T154500Z" data-end="20240829T163000Z" data-noc="TUR">
+<div class="event py-4" data-start="20240829T154500Z" data-end="20240829T163000Z" data-noc="SVK,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>
@@ -4614,7 +4614,13 @@
    PARA TABLE TENNIS
    </div>
    <div>Mixed Doubles - XD7 - Round of 16</div>
-    <div class="competitor TUR">🇹🇷 OZTURK/DUMAN </div>
+    <div class="competitors">
+      TRAVNICEK/KANOVA
+      🇸🇰
+      -
+      🇹🇷
+      OZTURK/DUMAN
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240829T155000Z" data-end="20240829T160000Z" data-noc="BRA,ESP,GRE,ITA,POL,UKR">
@@ -5871,6 +5877,48 @@
     </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240829T180000Z" data-end="20240829T184500Z" 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 - MD8 - Quarterfinal 2</div>
+    <div class="competitors">
+      CAO/FENG
+      🇨🇳
+      -
+      🇫🇷
+      MARTIN/THOMAS
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240829T180000Z" data-end="20240829T184500Z" data-noc="JPN,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 Doubles - MD8 - Quarterfinal 1</div>
+    <div class="competitors">
+      CHAIWUT/GLINBANCHE
+      🇹🇭
+      -
+      🇯🇵
+      SAITO/SHICHINO
+    </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240829T180000Z" data-end="20240829T184500Z" data-noc="POL,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>
@@ -5891,34 +5939,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240829T180000Z" data-end="20240829T184500Z" 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 - MD8 - Quarterfinal 1</div>
- </div>
-</div>
-<div class="event py-4" data-start="20240829T180000Z" data-end="20240829T184500Z" 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 - MD8 - Quarterfinal 2</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240829T180000Z" data-end="20240829T184500Z" data-noc="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>
@@ -6283,7 +6303,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" data-noc="">
+<div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" data-noc="KOR,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>
@@ -6295,9 +6315,16 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Doubles - MD8 - Quarterfinal 3</div>
+    <div class="competitors">
+      KIM/KIM
+      🇰🇷
+      -
+      🇹🇷
+      OZTURK/TURAN
+    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" data-noc="">
+<div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" data-noc="CHN,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>
@@ -6309,6 +6336,33 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Doubles - MD8 - Quarterfinal 4</div>
+    <div class="competitors">
+      LIU/ZHAI
+      🇨🇳
+      -
+      🇩🇪
+      BAUS/SCHMIDBERG
+    </div>
+ </div>
+</div>
+<div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" data-noc="GBR,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
+   </div>
+   <div>Mixed Doubles - XD17 - Round of 16</div>
+    <div class="competitors">
+      STACEY/TWOMEY
+      🇬🇧
+      -
+      🇵🇱
+      CHOJNOWSKI/MARSZAL
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" data-noc="BRA">
@@ -6325,20 +6379,6 @@
     <div class="competitor BRA">🇧🇷 SALMIN/ALEXANDRE </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" 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
-   </div>
-   <div>Mixed Doubles - XD17 - Round of 16</div>
-    <div class="competitor POL">🇵🇱 CHOJNOWSKI/MARSZAL </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240829T184500Z" data-end="20240829T193000Z" data-noc="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>
@@ -30434,9 +30474,9 @@
    <div class="text-2xl">
    🏅
    WHEELCHAIR FENCING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div>Women's Foil Team Gold Medal Match</div>
+   <div>Men's Foil Team Bronze Medal Match</div>
  </div>
 </div>
 <div class="event py-4" data-start="20240905T165500Z" data-end="20240905T170300Z" data-noc="">
@@ -30685,9 +30725,9 @@
    <div class="text-2xl">
    🏅
    WHEELCHAIR FENCING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div>Men's Foil Team Bronze Medal Match</div>
+   <div>Women's Foil Team Gold Medal Match</div>
  </div>
 </div>
 <div class="event py-4" data-start="20240905T180000Z" data-end="20240905T193000Z" data-noc="">
@@ -32504,9 +32544,9 @@
    <div class="text-2xl">
    🏅
    WHEELCHAIR FENCING
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div>Women's Épée Category A Bronze Medal Bout</div>
+   <div>Men's Épée Category B Bronze Medal Bout</div>
  </div>
 </div>
 <div class="event py-4" data-start="20240906T163000Z" data-end="20240906T170500Z" data-noc="">
@@ -32616,9 +32656,9 @@
    <div class="text-2xl">
    🏅
    WHEELCHAIR FENCING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div>Men's Épée Category B Bronze Medal Bout</div>
+   <div>Women's Épée Category A Bronze Medal Bout</div>
  </div>
 </div>
 <div class="event py-4" data-start="20240906T171000Z" data-end="20240906T171700Z" data-noc="">