diff --git a/docs/boxing/IRL.ics b/docs/boxing/IRL.ics
index 0f33a2203..5cf8b4362 100644
--- a/docs/boxing/IRL.ics
+++ b/docs/boxing/IRL.ics
@@ -85,6 +85,15 @@ SUMMARY:🥊 Wassila LKHADIRI 🇫🇷 - 🇮🇪 Daina MOOREHOUSE
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T200800Z-boxing-MENS-92KG-QUARTERFINAL
+DTSTAMP:20240801T200800Z
+DTSTART:20240801T200800Z
+DTEND:20240801T201900Z
+DESCRIPTION:Boxing - Men's 92kg - Quarterfinal\n🇮🇪 Jack MARLEY
+SUMMARY:🥊 Men's 92kg - Quarterfinal
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240802T134600Z-boxing-WOMENS-57KG-PRELIMINARIES-ROUND-OF-16-IRL-BUL
 DTSTAMP:20240802T134600Z
 DTSTART:20240802T134600Z
diff --git a/docs/boxing/general.ics b/docs/boxing/general.ics
index 0931eb0c4..d980a75a9 100644
--- a/docs/boxing/general.ics
+++ b/docs/boxing/general.ics
@@ -1371,7 +1371,7 @@ UID:20240801T200800Z-boxing-MENS-92KG-QUARTERFINAL
 DTSTAMP:20240801T200800Z
 DTSTART:20240801T200800Z
 DTEND:20240801T201900Z
-DESCRIPTION:Boxing - Men's 92kg - Quarterfinal
+DESCRIPTION:Boxing - Men's 92kg - Quarterfinal\n🇮🇪 Jack MARLEY
 SUMMARY:🥊 Men's 92kg - Quarterfinal
 LOCATION:North Paris Arena
 END:VEVENT
diff --git a/docs/fencing/EGY.ics b/docs/fencing/EGY.ics
index a2beee868..7cf9ef41a 100644
--- a/docs/fencing/EGY.ics
+++ b/docs/fencing/EGY.ics
@@ -193,6 +193,15 @@ SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇫🇷 Yannick BOREL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
+DTSTAMP:20240728T192000Z
+DTSTART:20240728T192000Z
+DTEND:20240728T194500Z
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32-EGY-USA
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
diff --git a/docs/fencing/FRA.ics b/docs/fencing/FRA.ics
index 934949585..c6f5232b7 100644
--- a/docs/fencing/FRA.ics
+++ b/docs/fencing/FRA.ics
@@ -238,6 +238,15 @@ SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇫🇷 Yannick BOREL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
+DTSTAMP:20240728T201500Z
+DTSTART:20240728T201500Z
+DTEND:20240728T204000Z
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
diff --git a/docs/fencing/HUN.ics b/docs/fencing/HUN.ics
index 79bec3e28..bfeca65c0 100644
--- a/docs/fencing/HUN.ics
+++ b/docs/fencing/HUN.ics
@@ -175,13 +175,12 @@ SUMMARY:🤺 KANO Koki 🇯🇵 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
-  ANDRASFI
-SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/JPN.ics b/docs/fencing/JPN.ics
index 3200516a3..3b26c3aee 100644
--- a/docs/fencing/JPN.ics
+++ b/docs/fencing/JPN.ics
@@ -148,12 +148,12 @@ SUMMARY:🤺 KANO Koki 🇯🇵 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
-SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 69f7e0f64..3a3af40dc 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -1228,13 +1228,12 @@ SUMMARY:🤺 Eleanor HARVEY 🇨🇦 - 🇮🇹 Alice VOLPI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
-  ANDRASFI
-SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -1247,12 +1246,12 @@ SUMMARY:🤺 Lauren SCRUGGS 🇺🇸 - 🇺🇸 Lee KIEFER
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
-SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/medals.ics b/docs/fencing/medals.ics
index 33a2ddbe2..591dde192 100644
--- a/docs/fencing/medals.ics
+++ b/docs/fencing/medals.ics
@@ -49,13 +49,12 @@ SUMMARY:🤺 Eleanor HARVEY 🇨🇦 - 🇮🇹 Alice VOLPI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
-  ANDRASFI
-SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -68,12 +67,12 @@ SUMMARY:🤺 Lauren SCRUGGS 🇺🇸 - 🇺🇸 Lee KIEFER
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
-SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/football/CAN.ics b/docs/football/CAN.ics
index 8776f636f..615bc2ec5 100644
--- a/docs/football/CAN.ics
+++ b/docs/football/CAN.ics
@@ -16,7 +16,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-A-FRA-CAN
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group A
 SUMMARY:⚽ FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Geoffroy-Guichard Stadium
diff --git a/docs/football/FRA.ics b/docs/football/FRA.ics
index 525f39ab7..5283ea143 100644
--- a/docs/football/FRA.ics
+++ b/docs/football/FRA.ics
@@ -34,7 +34,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-A-FRA-CAN
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group A
 SUMMARY:⚽ FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Geoffroy-Guichard Stadium
diff --git a/docs/football/GER.ics b/docs/football/GER.ics
index 2e987d096..9f08eafd0 100644
--- a/docs/football/GER.ics
+++ b/docs/football/GER.ics
@@ -16,7 +16,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-B-USA-GER
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group B
 SUMMARY:⚽ USA 🇺🇸 - 🇩🇪 GER
 LOCATION:Marseille Stadium
diff --git a/docs/football/USA.ics b/docs/football/USA.ics
index 286de11e4..1699f9186 100644
--- a/docs/football/USA.ics
+++ b/docs/football/USA.ics
@@ -34,7 +34,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-B-USA-GER
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group B
 SUMMARY:⚽ USA 🇺🇸 - 🇩🇪 GER
 LOCATION:Marseille Stadium
diff --git a/docs/football/general.ics b/docs/football/general.ics
index 9976bc74d..db9d3dccc 100644
--- a/docs/football/general.ics
+++ b/docs/football/general.ics
@@ -241,7 +241,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-A-FRA-CAN
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group A
 SUMMARY:⚽ FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Geoffroy-Guichard Stadium
@@ -250,7 +250,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-B-USA-GER
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group B
 SUMMARY:⚽ USA 🇺🇸 - 🇩🇪 GER
 LOCATION:Marseille Stadium
diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index e5060c240..1c32d67f1 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -842,12 +842,12 @@ SUMMARY:🏊 Women's 100m Butterfly Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/CAN.ics b/docs/general/CAN.ics
index 80603442f..3e0504316 100644
--- a/docs/general/CAN.ics
+++ b/docs/general/CAN.ics
@@ -768,7 +768,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-A-FRA-CAN
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group A
 SUMMARY:⚽ FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Geoffroy-Guichard Stadium
diff --git a/docs/general/EGY.ics b/docs/general/EGY.ics
index efd53b8aa..7439c7ae2 100644
--- a/docs/general/EGY.ics
+++ b/docs/general/EGY.ics
@@ -456,6 +456,15 @@ SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇫🇷 Yannick BOREL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
+DTSTAMP:20240728T192000Z
+DTSTART:20240728T192000Z
+DTEND:20240728T194500Z
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-64-EGY-ESP
 DTSTAMP:20240728T200000Z
 DTSTART:20240728T200000Z
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 0a8b33e98..7f1832850 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -1369,19 +1369,19 @@ SUMMARY:🏊 Men's 400m Individual Medley Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-A-FRA-CAN
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group A
 SUMMARY:⚽ FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Geoffroy-Guichard Stadium
@@ -1405,6 +1405,15 @@ SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇦🇷 Santiago LORENZO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
+DTSTAMP:20240728T201500Z
+DTSTART:20240728T201500Z
+DTEND:20240728T204000Z
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T233600Z-surfing-MENS-ROUND-2-HEAT-4-FRA-RSA
 DTSTAMP:20240728T233600Z
 DTSTART:20240728T233600Z
diff --git a/docs/general/GER.ics b/docs/general/GER.ics
index a53ca5405..f4ffbd9a7 100644
--- a/docs/general/GER.ics
+++ b/docs/general/GER.ics
@@ -996,7 +996,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-B-USA-GER
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group B
 SUMMARY:⚽ USA 🇺🇸 - 🇩🇪 GER
 LOCATION:Marseille Stadium
diff --git a/docs/general/HUN.ics b/docs/general/HUN.ics
index 51da39a8a..2744fe80e 100644
--- a/docs/general/HUN.ics
+++ b/docs/general/HUN.ics
@@ -545,13 +545,12 @@ SUMMARY:🤺 KANO Koki 🇯🇵 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
-  ANDRASFI
-SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/IRL.ics b/docs/general/IRL.ics
index 82e031d19..4da986ee6 100644
--- a/docs/general/IRL.ics
+++ b/docs/general/IRL.ics
@@ -699,6 +699,15 @@ SUMMARY:🥊 Wassila LKHADIRI 🇫🇷 - 🇮🇪 Daina MOOREHOUSE
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240801T200800Z-boxing-MENS-92KG-QUARTERFINAL
+DTSTAMP:20240801T200800Z
+DTSTART:20240801T200800Z
+DTEND:20240801T201900Z
+DESCRIPTION:Boxing - Men's 92kg - Quarterfinal\n🇮🇪 Jack MARLEY
+SUMMARY:🥊 Men's 92kg - Quarterfinal
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240802T133000Z-canoe-slalom-MENS-KAYAK-CROSS-TIME-TRIAL
 DTSTAMP:20240802T133000Z
 DTSTART:20240802T133000Z
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 40a063f22..66a5e86c6 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1060,12 +1060,12 @@ SUMMARY:🏸 WATANABE/HIGASHINO 🇯🇵 - 🇹🇼 YE/LEE
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
-SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index b754cb84f..44cc14846 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -1199,7 +1199,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-B-USA-GER
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group B
 SUMMARY:⚽ USA 🇺🇸 - 🇩🇪 GER
 LOCATION:Marseille Stadium
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 77f073197..e43c1cb64 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -7302,12 +7302,12 @@ SUMMARY:🥊 Georgii KUSHITASHVILI 🇬🇪 - 🇹🇯 Davlat BOLTAEV
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7341,7 +7341,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-A-FRA-CAN
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group A
 SUMMARY:⚽ FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Geoffroy-Guichard Stadium
@@ -7350,7 +7350,7 @@ BEGIN:VEVENT
 UID:20240728T190000Z-football-WOMENS-GROUP-B-USA-GER
 DTSTAMP:20240728T190000Z
 DTSTART:20240728T190000Z
-DTEND:20240728T210000Z
+DTEND:20240728T204500Z
 DESCRIPTION:Football - Women's Group B
 SUMMARY:⚽ USA 🇺🇸 - 🇩🇪 GER
 LOCATION:Marseille Stadium
@@ -7491,13 +7491,12 @@ SUMMARY:🥊 Yasmine MOUTTAKI 🇲🇦 - 🇵🇭 Aira VILLEGAS
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
-  ANDRASFI
-SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -7629,12 +7628,12 @@ SUMMARY:🏓 Offiong EDEM 🇳🇬 - 🇧🇷 Bruna TAKAHASHI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
-SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -19818,7 +19817,7 @@ UID:20240801T200800Z-boxing-MENS-92KG-QUARTERFINAL
 DTSTAMP:20240801T200800Z
 DTSTART:20240801T200800Z
 DTEND:20240801T201900Z
-DESCRIPTION:Boxing - Men's 92kg - Quarterfinal
+DESCRIPTION:Boxing - Men's 92kg - Quarterfinal\n🇮🇪 Jack MARLEY
 SUMMARY:🥊 Men's 92kg - Quarterfinal
 LOCATION:North Paris Arena
 END:VEVENT
diff --git a/docs/medals/EGY.ics b/docs/medals/EGY.ics
index 15a67a731..e8f38071e 100644
--- a/docs/medals/EGY.ics
+++ b/docs/medals/EGY.ics
@@ -12,4 +12,13 @@ DESCRIPTION:Fencing - Men's Sabre Individual Bronze Medal Bout
 SUMMARY:🤺 Luigi SAMELE 🇮🇹 - 🇪🇬 Ziad ELSISSY
 LOCATION:Grand Palais
 END:VEVENT
+BEGIN:VEVENT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
+DTSTAMP:20240728T192000Z
+DTSTART:20240728T192000Z
+DTEND:20240728T194500Z
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
+LOCATION:Grand Palais
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/medals/FRA.ics b/docs/medals/FRA.ics
index 260c843ba..1fda44864 100644
--- a/docs/medals/FRA.ics
+++ b/docs/medals/FRA.ics
@@ -164,6 +164,15 @@ SUMMARY:🏊 Men's 400m Individual Medley Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
+DTSTAMP:20240728T201500Z
+DTSTART:20240728T201500Z
+DTEND:20240728T204000Z
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T073000Z-shooting-10M-AIR-RIFLE-WOMENS-FINAL
 DTSTAMP:20240729T073000Z
 DTSTART:20240729T073000Z
diff --git a/docs/medals/HUN.ics b/docs/medals/HUN.ics
index c5838710a..6cabbf55a 100644
--- a/docs/medals/HUN.ics
+++ b/docs/medals/HUN.ics
@@ -84,13 +84,12 @@ SUMMARY:🥋 Reka PUPP 🇭🇺 - 🇫🇷 Amandine BUCHARD
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
-  ANDRASFI
-SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/medals/JPN.ics b/docs/medals/JPN.ics
index f236e06e0..80e77b332 100644
--- a/docs/medals/JPN.ics
+++ b/docs/medals/JPN.ics
@@ -87,12 +87,12 @@ SUMMARY:🏊 Women's 100m Butterfly Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
-SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/medals/general.ics b/docs/medals/general.ics
index ed5bd8847..1b39a1631 100644
--- a/docs/medals/general.ics
+++ b/docs/medals/general.ics
@@ -396,13 +396,12 @@ SUMMARY:🤺 Eleanor HARVEY 🇨🇦 - 🇮🇹 Alice VOLPI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT-EGY-HUN
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
-  ANDRASFI
-SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -426,12 +425,12 @@ SUMMARY:🤺 Lauren SCRUGGS 🇺🇸 - 🇺🇸 Lee KIEFER
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT-FRA-JPN
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
-SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+SUMMARY:🤺 Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/AUS.ics b/docs/surfing/AUS.ics
index edd876d5e..451f72438 100644
--- a/docs/surfing/AUS.ics
+++ b/docs/surfing/AUS.ics
@@ -44,12 +44,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 4
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/FRA.ics b/docs/surfing/FRA.ics
index 0479b1522..0dda8f3cd 100644
--- a/docs/surfing/FRA.ics
+++ b/docs/surfing/FRA.ics
@@ -44,12 +44,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 5
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 4b05ece36..dcd95ce3b 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -191,12 +191,12 @@ SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 1cfd39762..098593555 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -10234,7 +10234,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T184800Z" data-end="20240728T191800Z" data-noc="FRA,AUS">
+<div class="event py-4" data-start="20240728T184800Z" data-end="20240728T191800Z" data-noc="AUS,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10242,7 +10242,7 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
+   <div class="">Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
    </div>
  </div>
 </div>
@@ -10282,7 +10282,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T190000Z" data-end="20240728T210000Z" data-noc="FRA,CAN">
+<div class="event py-4" data-start="20240728T190000Z" data-end="20240728T204500Z" data-noc="FRA,CAN">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10294,7 +10294,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T190000Z" data-end="20240728T210000Z" data-noc="USA,GER">
+<div class="event py-4" data-start="20240728T190000Z" data-end="20240728T204500Z" data-noc="USA,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10484,7 +10484,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T192000Z" data-end="20240728T194500Z" data-noc="HUN">
+<div class="event py-4" data-start="20240728T192000Z" data-end="20240728T194500Z" data-noc="EGY,HUN">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10492,8 +10492,7 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Épée Individual Bronze Medal Bout
-<div class="competitor HUN">🇭🇺 Tibor ANDRASFI</div>
+   <div class="">Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
    </div>
  </div>
 </div>
@@ -10673,7 +10672,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T201500Z" data-end="20240728T204000Z" data-noc="JPN">
+<div class="event py-4" data-start="20240728T201500Z" data-end="20240728T204000Z" data-noc="FRA,JPN">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10681,8 +10680,7 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Épée Individual Gold Medal Bout
-<div class="competitor JPN">🇯🇵 KANO Koki</div>
+   <div class="">Yannick BOREL 🇫🇷 - 🇯🇵 KANO Koki
    </div>
  </div>
 </div>
@@ -27862,7 +27860,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240801T200800Z" data-end="20240801T201900Z" data-noc="">
+<div class="event py-4" data-start="20240801T200800Z" data-end="20240801T201900Z" data-noc="IRL">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -27871,6 +27869,7 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's 92kg - Quarterfinal
+<div class="competitor IRL">🇮🇪 Jack MARLEY</div>
    </div>
  </div>
 </div>