diff --git a/docs/en/blind-football/COL.ics b/docs/en/blind-football/COL.ics
index 2d83863c8..2a583ec75 100644
--- a/docs/en/blind-football/COL.ics
+++ b/docs/en/blind-football/COL.ics
@@ -39,4 +39,13 @@ DESCRIPTION:Blind Football - Men's Semi-final
 SUMMARY: COL 🇨🇴 - 🇫🇷 FRA
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
+BEGIN:VEVENT
+UID:20240907T153000Z-blind-football-MENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240907T153000Z
+DTSTART:20240907T153000Z
+DTEND:20240907T163000Z
+DESCRIPTION:Blind Football - Men's Bronze Medal Match\n🇨🇴 COL
+SUMMARY:Men's Bronze Medal Match
+LOCATION:Eiffel Tower Stadium
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/blind-football/FRA.ics b/docs/en/blind-football/FRA.ics
index d8bbb6f8b..e35e334c3 100644
--- a/docs/en/blind-football/FRA.ics
+++ b/docs/en/blind-football/FRA.ics
@@ -39,4 +39,13 @@ DESCRIPTION:Blind Football - Men's Semi-final
 SUMMARY: COL 🇨🇴 - 🇫🇷 FRA
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
+BEGIN:VEVENT
+UID:20240907T180000Z-blind-football-MENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240907T180000Z
+DTSTART:20240907T180000Z
+DTEND:20240907T190000Z
+DESCRIPTION:Blind Football - Men's Gold Medal Match\n🇫🇷 FRA
+SUMMARY:Men's Gold Medal Match
+LOCATION:Eiffel Tower Stadium
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/blind-football/general.ics b/docs/en/blind-football/general.ics
index 35aa9162b..630eada75 100644
--- a/docs/en/blind-football/general.ics
+++ b/docs/en/blind-football/general.ics
@@ -152,7 +152,7 @@ UID:20240907T153000Z-blind-football-MENS-BRONZE-MEDAL-MATCH
 DTSTAMP:20240907T153000Z
 DTSTART:20240907T153000Z
 DTEND:20240907T163000Z
-DESCRIPTION:Blind Football - Men's Bronze Medal Match
+DESCRIPTION:Blind Football - Men's Bronze Medal Match\n🇨🇴 COL
 SUMMARY:Men's Bronze Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
@@ -161,7 +161,7 @@ UID:20240907T180000Z-blind-football-MENS-GOLD-MEDAL-MATCH
 DTSTAMP:20240907T180000Z
 DTSTART:20240907T180000Z
 DTEND:20240907T190000Z
-DESCRIPTION:Blind Football - Men's Gold Medal Match
+DESCRIPTION:Blind Football - Men's Gold Medal Match\n🇫🇷 FRA
 SUMMARY:Men's Gold Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
diff --git a/docs/en/blind-football/medals.ics b/docs/en/blind-football/medals.ics
index bb79eabfb..bbba30a90 100644
--- a/docs/en/blind-football/medals.ics
+++ b/docs/en/blind-football/medals.ics
@@ -8,7 +8,7 @@ UID:20240907T153000Z-blind-football-MENS-BRONZE-MEDAL-MATCH
 DTSTAMP:20240907T153000Z
 DTSTART:20240907T153000Z
 DTEND:20240907T163000Z
-DESCRIPTION:Blind Football - Men's Bronze Medal Match
+DESCRIPTION:Blind Football - Men's Bronze Medal Match\n🇨🇴 COL
 SUMMARY:Men's Bronze Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
@@ -17,7 +17,7 @@ UID:20240907T180000Z-blind-football-MENS-GOLD-MEDAL-MATCH
 DTSTAMP:20240907T180000Z
 DTSTART:20240907T180000Z
 DTEND:20240907T190000Z
-DESCRIPTION:Blind Football - Men's Gold Medal Match
+DESCRIPTION:Blind Football - Men's Gold Medal Match\n🇫🇷 FRA
 SUMMARY:Men's Gold Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
diff --git a/docs/en/general/ARG.ics b/docs/en/general/ARG.ics
index 65f592f29..ea2599b94 100644
--- a/docs/en/general/ARG.ics
+++ b/docs/en/general/ARG.ics
@@ -1603,6 +1603,15 @@ SUMMARY:Women's 100m Freestyle - S11 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
+DTSTAMP:20240907T113000Z
+DTSTART:20240907T113000Z
+DTEND:20240907T213000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240908T190000Z-closing-ceremony
 DTSTAMP:20240908T190000Z
 DTSTART:20240908T190000Z
diff --git a/docs/en/general/COL.ics b/docs/en/general/COL.ics
index b577ec0c3..13ea14a9b 100644
--- a/docs/en/general/COL.ics
+++ b/docs/en/general/COL.ics
@@ -1788,6 +1788,15 @@ SUMMARY:Men's T1-2 Road Race
 LOCATION:Clichy-sous-bois
 END:VEVENT
 BEGIN:VEVENT
+UID:20240907T153000Z-blind-football-MENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240907T153000Z
+DTSTART:20240907T153000Z
+DTEND:20240907T163000Z
+DESCRIPTION:Blind Football - Men's Bronze Medal Match\n🇨🇴 COL
+SUMMARY:Men's Bronze Medal Match
+LOCATION:Eiffel Tower Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T163500Z-para-powerlifting-MENS-UP-TO-97KG-FINAL
 DTSTAMP:20240907T163500Z
 DTSTART:20240907T163500Z
diff --git a/docs/en/general/ESP.ics b/docs/en/general/ESP.ics
index 4e69549bb..c6beba8db 100644
--- a/docs/en/general/ESP.ics
+++ b/docs/en/general/ESP.ics
@@ -3288,13 +3288,12 @@ SUMMARY:Women's 200m Individual Medley - SM5 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match\n🇪🇸
-  Martin de la PUENTE
-SUMMARY:Men's Singles Bronze Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/FRA.ics b/docs/en/general/FRA.ics
index 58eed3d06..b49abcb72 100644
--- a/docs/en/general/FRA.ics
+++ b/docs/en/general/FRA.ics
@@ -4744,6 +4744,15 @@ SUMMARY:Men's up to 97kg Final
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240907T180000Z-blind-football-MENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240907T180000Z
+DTSTART:20240907T180000Z
+DTEND:20240907T190000Z
+DESCRIPTION:Blind Football - Men's Gold Medal Match\n🇫🇷 FRA
+SUMMARY:Men's Gold Medal Match
+LOCATION:Eiffel Tower Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T183400Z-para-swimming-MIXED-4X100M-FREESTYLE-RELAY-34-POINTS-F
 DTSTAMP:20240907T183400Z
 DTSTART:20240907T183400Z
diff --git a/docs/en/general/GBR.ics b/docs/en/general/GBR.ics
index 28823d457..66b09e1fc 100644
--- a/docs/en/general/GBR.ics
+++ b/docs/en/general/GBR.ics
@@ -4536,13 +4536,12 @@ SUMMARY: FRA 🇫🇷 - 🇬🇧 GBR
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match\n🇬🇧 Alfie
-  HEWETT
-SUMMARY:Men's Singles Gold Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/JPN.ics b/docs/en/general/JPN.ics
index 527dc348a..58d146262 100644
--- a/docs/en/general/JPN.ics
+++ b/docs/en/general/JPN.ics
@@ -3722,6 +3722,15 @@ SUMMARY:Women's 200m Individual Medley - SM5 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
+DTSTAMP:20240907T113000Z
+DTSTART:20240907T113000Z
+DTEND:20240907T213000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T114500Z-wheelchair-basketball-WOMENS-PLAYOFF-7-8-JPN-ESP
 DTSTAMP:20240907T114500Z
 DTSTART:20240907T114500Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 4797ef591..17e9774d4 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -27345,23 +27345,21 @@ SUMMARY:Men's Singles - MS8 - Gold Medal Match
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match\n🇪🇸
-  Martin de la PUENTE
-SUMMARY:Men's Singles Bronze Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match\n🇬🇧 Alfie
-  HEWETT
-SUMMARY:Men's Singles Gold Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
@@ -27644,7 +27642,7 @@ UID:20240907T153000Z-blind-football-MENS-BRONZE-MEDAL-MATCH
 DTSTAMP:20240907T153000Z
 DTSTART:20240907T153000Z
 DTEND:20240907T163000Z
-DESCRIPTION:Blind Football - Men's Bronze Medal Match
+DESCRIPTION:Blind Football - Men's Bronze Medal Match\n🇨🇴 COL
 SUMMARY:Men's Bronze Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
@@ -27949,7 +27947,7 @@ UID:20240907T180000Z-blind-football-MENS-GOLD-MEDAL-MATCH
 DTSTAMP:20240907T180000Z
 DTSTART:20240907T180000Z
 DTEND:20240907T190000Z
-DESCRIPTION:Blind Football - Men's Gold Medal Match
+DESCRIPTION:Blind Football - Men's Gold Medal Match\n🇫🇷 FRA
 SUMMARY:Men's Gold Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
diff --git a/docs/en/medals/ARG.ics b/docs/en/medals/ARG.ics
index d5b3d5a75..e52fabc65 100644
--- a/docs/en/medals/ARG.ics
+++ b/docs/en/medals/ARG.ics
@@ -444,4 +444,13 @@ DESCRIPTION:Para Cycling Road - Men's C1-3 Road Race\n🇨🇦 Alexandre
 SUMMARY:Men's C1-3 Road Race
 LOCATION:Clichy-sous-bois
 END:VEVENT
+BEGIN:VEVENT
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
+DTSTAMP:20240907T113000Z
+DTSTART:20240907T113000Z
+DTEND:20240907T213000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
+LOCATION:Roland-Garros Stadium
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/medals/COL.ics b/docs/en/medals/COL.ics
index 80df5f53a..fef63a946 100644
--- a/docs/en/medals/COL.ics
+++ b/docs/en/medals/COL.ics
@@ -676,6 +676,15 @@ SUMMARY:Men's T1-2 Road Race
 LOCATION:Clichy-sous-bois
 END:VEVENT
 BEGIN:VEVENT
+UID:20240907T153000Z-blind-football-MENS-BRONZE-MEDAL-MATCH
+DTSTAMP:20240907T153000Z
+DTSTART:20240907T153000Z
+DTEND:20240907T163000Z
+DESCRIPTION:Blind Football - Men's Bronze Medal Match\n🇨🇴 COL
+SUMMARY:Men's Bronze Medal Match
+LOCATION:Eiffel Tower Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T163500Z-para-powerlifting-MENS-UP-TO-97KG-FINAL
 DTSTAMP:20240907T163500Z
 DTSTART:20240907T163500Z
diff --git a/docs/en/medals/ESP.ics b/docs/en/medals/ESP.ics
index 3ed453da0..4bc258027 100644
--- a/docs/en/medals/ESP.ics
+++ b/docs/en/medals/ESP.ics
@@ -1126,13 +1126,12 @@ SUMMARY: Laurens DEVOS 🇧🇪 - 🇪🇸 Ander CEPAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match\n🇪🇸
-  Martin de la PUENTE
-SUMMARY:Men's Singles Bronze Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/FRA.ics b/docs/en/medals/FRA.ics
index f350174c0..b4fe6cbfd 100644
--- a/docs/en/medals/FRA.ics
+++ b/docs/en/medals/FRA.ics
@@ -1423,6 +1423,15 @@ SUMMARY:Men's up to 97kg Final
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240907T180000Z-blind-football-MENS-GOLD-MEDAL-MATCH
+DTSTAMP:20240907T180000Z
+DTSTART:20240907T180000Z
+DTEND:20240907T190000Z
+DESCRIPTION:Blind Football - Men's Gold Medal Match\n🇫🇷 FRA
+SUMMARY:Men's Gold Medal Match
+LOCATION:Eiffel Tower Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T183400Z-para-swimming-MIXED-4X100M-FREESTYLE-RELAY-34-POINTS-F
 DTSTAMP:20240907T183400Z
 DTSTART:20240907T183400Z
diff --git a/docs/en/medals/GBR.ics b/docs/en/medals/GBR.ics
index c802e6bcb..d36f41b44 100644
--- a/docs/en/medals/GBR.ics
+++ b/docs/en/medals/GBR.ics
@@ -1667,13 +1667,12 @@ SUMMARY:Individual Freestyle Event - Grade I
 LOCATION:Château de Versailles
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match\n🇬🇧 Alfie
-  HEWETT
-SUMMARY:Men's Singles Gold Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/JPN.ics b/docs/en/medals/JPN.ics
index 6176bbe63..6be0337bb 100644
--- a/docs/en/medals/JPN.ics
+++ b/docs/en/medals/JPN.ics
@@ -913,6 +913,15 @@ SUMMARY:Women's C1-3 Road Race
 LOCATION:Clichy-sous-bois
 END:VEVENT
 BEGIN:VEVENT
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
+DTSTAMP:20240907T113000Z
+DTSTART:20240907T113000Z
+DTEND:20240907T213000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T120600Z-para-equestrian-INDIVIDUAL-FREESTYLE-EVENT-GRADE-II
 DTSTAMP:20240907T120600Z
 DTSTART:20240907T120600Z
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index ee82127ff..11770ae87 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -6951,23 +6951,21 @@ SUMMARY:Men's Singles - MS8 - Gold Medal Match
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match\n🇪🇸
-  Martin de la PUENTE
-SUMMARY:Men's Singles Bronze Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match\n🇬🇧 Alfie
-  HEWETT
-SUMMARY:Men's Singles Gold Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
@@ -7196,7 +7194,7 @@ UID:20240907T153000Z-blind-football-MENS-BRONZE-MEDAL-MATCH
 DTSTAMP:20240907T153000Z
 DTSTART:20240907T153000Z
 DTEND:20240907T163000Z
-DESCRIPTION:Blind Football - Men's Bronze Medal Match
+DESCRIPTION:Blind Football - Men's Bronze Medal Match\n🇨🇴 COL
 SUMMARY:Men's Bronze Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
@@ -7492,7 +7490,7 @@ UID:20240907T180000Z-blind-football-MENS-GOLD-MEDAL-MATCH
 DTSTAMP:20240907T180000Z
 DTSTART:20240907T180000Z
 DTEND:20240907T190000Z
-DESCRIPTION:Blind Football - Men's Gold Medal Match
+DESCRIPTION:Blind Football - Men's Gold Medal Match\n🇫🇷 FRA
 SUMMARY:Men's Gold Medal Match
 LOCATION:Eiffel Tower Stadium
 END:VEVENT
diff --git a/docs/en/wheelchair-tennis/ARG.ics b/docs/en/wheelchair-tennis/ARG.ics
index 73cdd8d6b..4dc1b3703 100644
--- a/docs/en/wheelchair-tennis/ARG.ics
+++ b/docs/en/wheelchair-tennis/ARG.ics
@@ -84,4 +84,13 @@ DESCRIPTION:Wheelchair Tennis - Men's Singles Semi-final
 SUMMARY: Gustavo FERNANDEZ 🇦🇷 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
+BEGIN:VEVENT
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
+DTSTAMP:20240907T113000Z
+DTSTART:20240907T113000Z
+DTEND:20240907T213000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
+LOCATION:Roland-Garros Stadium
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-tennis/ESP.ics b/docs/en/wheelchair-tennis/ESP.ics
index 604d4cb7a..c5b304fe2 100644
--- a/docs/en/wheelchair-tennis/ESP.ics
+++ b/docs/en/wheelchair-tennis/ESP.ics
@@ -103,13 +103,12 @@ SUMMARY: CATTANEO/HOUDET 🇫🇷 - 🇪🇸 CAVERZASCHI/DE LA PUE
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match\n🇪🇸
-  Martin de la PUENTE
-SUMMARY:Men's Singles Bronze Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-tennis/GBR.ics b/docs/en/wheelchair-tennis/GBR.ics
index f20973b9a..ece43f553 100644
--- a/docs/en/wheelchair-tennis/GBR.ics
+++ b/docs/en/wheelchair-tennis/GBR.ics
@@ -247,13 +247,12 @@ SUMMARY: HEWETT/REID 🇬🇧 - 🇯🇵 MIKI/ODA
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match\n🇬🇧 Alfie
-  HEWETT
-SUMMARY:Men's Singles Gold Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-tennis/JPN.ics b/docs/en/wheelchair-tennis/JPN.ics
index f39950bc9..23081cb46 100644
--- a/docs/en/wheelchair-tennis/JPN.ics
+++ b/docs/en/wheelchair-tennis/JPN.ics
@@ -282,4 +282,13 @@ DESCRIPTION:Wheelchair Tennis - Men's Doubles Gold Medal Match
 SUMMARY: HEWETT/REID 🇬🇧 - 🇯🇵 MIKI/ODA
 LOCATION:Roland-Garros Stadium
 END:VEVENT
+BEGIN:VEVENT
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
+DTSTAMP:20240907T113000Z
+DTSTART:20240907T113000Z
+DTEND:20240907T213000Z
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
+LOCATION:Roland-Garros Stadium
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-tennis/general.ics b/docs/en/wheelchair-tennis/general.ics
index d3f8553b4..5cef402bd 100644
--- a/docs/en/wheelchair-tennis/general.ics
+++ b/docs/en/wheelchair-tennis/general.ics
@@ -1192,23 +1192,21 @@ SUMMARY:Order of play available evening before
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match\n🇪🇸
-  Martin de la PUENTE
-SUMMARY:Men's Singles Bronze Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match\n🇬🇧 Alfie
-  HEWETT
-SUMMARY:Men's Singles Gold Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-tennis/medals.ics b/docs/en/wheelchair-tennis/medals.ics
index 36009f1a9..1fba1fbbf 100644
--- a/docs/en/wheelchair-tennis/medals.ics
+++ b/docs/en/wheelchair-tennis/medals.ics
@@ -94,23 +94,21 @@ SUMMARY: HEWETT/REID 🇬🇧 - 🇯🇵 MIKI/ODA
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH-GBR-JP
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match\n🇪🇸
-  Martin de la PUENTE
-SUMMARY:Men's Singles Bronze Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match
+SUMMARY: Alfie HEWETT 🇬🇧 - 🇯🇵 ODA Tokito
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-GOLD-MEDAL-MATCH
+UID:20240907T113000Z-wheelchair-tennis-MENS-SINGLES-BRONZE-MEDAL-MATCH-ESP-
 DTSTAMP:20240907T113000Z
 DTSTART:20240907T113000Z
 DTEND:20240907T213000Z
-DESCRIPTION:Wheelchair Tennis - Men's Singles Gold Medal Match\n🇬🇧 Alfie
-  HEWETT
-SUMMARY:Men's Singles Gold Medal Match
+DESCRIPTION:Wheelchair Tennis - Men's Singles Bronze Medal Match
+SUMMARY: Martin de la PUENTE 🇪🇸 - 🇦🇷 Gustavo FERNANDEZ
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/medals.html b/docs/medals.html
index 7dbdc16ac..e6eefbb55 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -2453,13 +2453,18 @@
   <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">15</span>
-    <span class="inline-block text-center w-1/6 flex-none">18</span>
+    <span class="inline-block text-center w-1/6 flex-none">19</span>
     <span class="inline-block text-center w-1/6 flex-none">25</span>
-    <span class="inline-block text-center w-1/6 flex-none">58</span>
+    <span class="inline-block text-center w-1/6 flex-none">59</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Oksana BOTURCHUK</td>
+      <td>Para Athletics - Women's 100m - T12 Final</td>
+    </tr>
     <tr>
       <td class="bronze">&#9679;</td>
       <td>Danylo CHUFAROV</td>
@@ -3330,12 +3335,17 @@
     <span class="inline-block flex-auto">🇩🇪 Germany</span>
     <span class="inline-block text-center w-1/6 flex-none">8</span>
     <span class="inline-block text-center w-1/6 flex-none">9</span>
-    <span class="inline-block text-center w-1/6 flex-none">14</span>
-    <span class="inline-block text-center w-1/6 flex-none">31</span>
+    <span class="inline-block text-center w-1/6 flex-none">15</span>
+    <span class="inline-block text-center w-1/6 flex-none">32</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-05</td></tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Katrin MUELLER-ROTTGARDT</td>
+      <td>Para Athletics - Women's 100m - T12 Final</td>
+    </tr>
     <tr>
       <td class="gold">&#9679;</td>
       <td>Taliso ENGEL</td>
@@ -4913,6 +4923,54 @@
   </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">🇨🇺 Cuba</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">0</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-09-05</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Omara DURAND ELIAS</td>
+      <td>Para Athletics - Women's 100m - T12 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Pablo RAMIREZ BARRIENTOS</td>
+      <td>Para Powerlifting - Men's up to 54kg Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Guillermo VARONA GONZALEZ</td>
+      <td>Para Athletics - Men's Javelin Throw - F46 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Omara DURAND ELIAS</td>
+      <td>Para Athletics - Women's 400m - T12 Final</td>
+    </tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Robiel Yankiel SOL CERVANTES</td>
+      <td>Para Athletics - Men's Long Jump - T47 Final</td>
+    </tr>
+    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>Yamel Luis VIVES SUARES</td>
+      <td>Para Athletics - Men's 100m - T44 Final</td>
+    </tr>
+  </table>
+  </div>
+</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
@@ -5331,48 +5389,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">🇨🇺 Cuba</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">2</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>
-  </div>
-  <div class="collapse-content">
-  <table class="table-full">
-    <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Pablo RAMIREZ BARRIENTOS</td>
-      <td>Para Powerlifting - Men's up to 54kg Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-03</td></tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Guillermo VARONA GONZALEZ</td>
-      <td>Para Athletics - Men's Javelin Throw - F46 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Omara DURAND ELIAS</td>
-      <td>Para Athletics - Women's 400m - T12 Final</td>
-    </tr>
-    <tr>
-      <td class="gold">&#9679;</td>
-      <td>Robiel Yankiel SOL CERVANTES</td>
-      <td>Para Athletics - Men's Long Jump - T47 Final</td>
-    </tr>
-    <tr><td colspan="3" class="font-medium">2024-09-01</td></tr>
-    <tr>
-      <td class="silver">&#9679;</td>
-      <td>Yamel Luis VIVES SUARES</td>
-      <td>Para Athletics - Men's 100m - T44 Final</td>
-    </tr>
-  </table>
-  </div>
-</div>
 <div class="collapse collapse-arrow bg-gray-100 mb-1">
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
diff --git a/docs/today.html b/docs/today.html
index 983fe4457..b1789651a 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -58287,22 +58287,7 @@
    <div>Men's Singles - MS8 - Gold Medal Match</div>
  </div>
 </div>
-<div class="event py-4 bg-orange-700" data-start="20240907T113000Z" data-end="20240907T213000Z" data-noc="ESP" >
- <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
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles Bronze Medal Match</div>
-    <div class="competitor ESP">🇪🇸 Martin de la PUENTE </div>
- </div>
-</div>
-<div class="event py-4 bg-amber-400" data-start="20240907T113000Z" data-end="20240907T213000Z" data-noc="GBR" >
+<div class="event py-4 bg-amber-400" data-start="20240907T113000Z" data-end="20240907T213000Z" data-noc="GBR,JPN" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -58314,7 +58299,34 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles Gold Medal Match</div>
-    <div class="competitor GBR">🇬🇧 Alfie HEWETT </div>
+    <div class="competitors">
+      Alfie HEWETT
+      🇬🇧
+      -
+      🇯🇵
+      ODA Tokito
+    </div>
+ </div>
+</div>
+<div class="event py-4 bg-orange-700" data-start="20240907T113000Z" data-end="20240907T213000Z" data-noc="ARG,ESP" >
+ <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
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles Bronze Medal Match</div>
+    <div class="competitors">
+      Martin de la PUENTE
+      🇪🇸
+      -
+      🇦🇷
+      Gustavo FERNANDEZ
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240907T113500Z" data-end="20240907T124000Z" data-noc="AUS,BRA,CHN,EGY,KAZ,POL,UAE,UGA,UKR,UZB" >
@@ -58768,7 +58780,7 @@
    <div>Men's 200m Individual Medley - SM10 Final</div>
  </div>
 </div>
-<div class="event py-4 bg-orange-700" data-start="20240907T153000Z" data-end="20240907T163000Z" data-noc="" >
+<div class="event py-4 bg-orange-700" data-start="20240907T153000Z" data-end="20240907T163000Z" data-noc="COL" >
  <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>
@@ -58780,6 +58792,7 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Bronze Medal Match</div>
+    <div class="competitor COL">🇨🇴 Colombia </div>
  </div>
 </div>
 <div class="event py-4 bg-orange-700" data-start="20240907T153000Z" data-end="20240907T164500Z" data-noc="" >
@@ -59257,7 +59270,7 @@
    <div>Men's 200m Freestyle - S3 Final</div>
  </div>
 </div>
-<div class="event py-4 bg-amber-400" data-start="20240907T180000Z" data-end="20240907T190000Z" data-noc="" >
+<div class="event py-4 bg-amber-400" data-start="20240907T180000Z" data-end="20240907T190000Z" data-noc="FRA" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -59269,6 +59282,7 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Gold Medal Match</div>
+    <div class="competitor FRA">🇫🇷 France </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240907T180000Z" data-end="20240907T191500Z" data-noc="" >